rm -rf .librarian .tmp
Merge remote-tracking branch 'origin/puppet/3.3.2' into puppet/3.3.2