Merge remote-tracking branch 'puppetlabs/master'