Merge in master from WMF gerrit

Not sure how this again ended up with a bunch of conflicts...