2015-09-17 - releng
16:09 <hashar> rebase integration puppetmaster [releng]