2016-05-03 - production
16:04	<bblack>	merging https://gerrit.wikimedia.org/r/286278 (puppetswat)	[production]