2019-12-12 - production
14:02	<jbond42>	merge puppet-merge refactor	[production]