2014-10-09 - production
18:51	<bd808>	cherry-picked I3ae9edab2505c37945fe66863721913a6d33223c to scap	[production]