Merge r81718 from 1.17wmf1