2015-06-18 - production
19:26	<akosiaris>	puppet-merged on strontium	[production]