Merge branch 'foreman' into 'master'

Foreman

See merge request !1