commit1
Merge remote-tracking branch 'puppet/master'