Merge branch 'master' into wmf/1.24wmf14
Picks up:
Change-Id: I999b8adc8be65dda4e5543177d2a8f6ea71c3c20