merged master after 1.20wmf3