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