Fix puppet::master
Merge branch 'issue-285' into issue-291
Merge pull request #291 from tomaszdurka/issue-291

Fix puppet::master