Merge r67177 from 1.16wmf4