2015-03-17 - production
20:00	<YuviPanda>	stashing TimStarling’s changes to scap, re-enabling puppet on tin	[production]