Update my master

pull puppetlabs master to update my fork