2015-02-13 - releng
23:25	<bd808>	cherry-picked https://gerrit.wikimedia.org/r/#/c/190231/ to deployment-salt for testing	[releng]