Merge r55331 from wmf-deployment (which was merged from a live hack)