Merge branch 'master' of https://github.com/Katello/katello into bastion