Merge branch 'master' of github.com:lofic/puppet-passenger