BAC-1990 - Merge patch for MW 1.19.10

Merging #2460 to release-205 as the list of security fixes was made public by WMF this morning.