2016-05-03 - production
16:32	<bblack>	merging https://gerrit.wikimedia.org/r/#/c/282322 for puppetswat	[production]