2018-04-06 - production
19:43	<ottomata>	running puppet-merge on rhodium after clash between puppet-merge and new patch submitted	[production]