1.6 stable

http://projects.theforeman.org/rb/release/22