Merge branch 'master' of git://github.com/Katello/katello