2017-05-03 - production
15:09	<RoanKattouw>	Live-hacked (cherry-picked) https://gerrit.wikimedia.org/r/#/c/351653/ onto naos and synced to mwdebug1002 for testing	[production]