Merge remote-tracking branch 'wikimedia/master'
Merge remote-tracking branch 'wikimedia/master'