Swap build order as facter's a puppet BR
Merge branch 'master' into puppet-4

Conflicts:
	build.sh