<Revert "Revert "Revert "Revert "Revert "Merge branch 'master' of https://github.com/Fonzie2k/puppetmaster"""""

This reverts commit faaf61146a209619a8f384019d67271ef9b186c3.