2013-09-27 - production
23:56	<ori-l>	Manually synchronized changes 86329, 86330, 86331 to hafnium & professor & temporarily disabled puppet to prevent it from clobbering the changes. I'll re-enable once they're merged.	[production]