2015-05-09 - releng
00:10	<bd808>	Cherry-picked https://gerrit.wikimedia.org/r/#/c/209830 to deployment-bastion:/srv/deployment/scap/scap and deployed with trebuchet	[releng]