Fixed alternatives
Merge branch 'master' into foreman