2016-03-24 - production
11:10	<gehel>	running puppet-merge manually on strontium to correct unmerged changes.	[production]