2016-05-03 - production
16:28	<bblack>	merging https://gerrit.wikimedia.org/r/286598 for puppetswat	[production]