Merge r82361 from 1.17wmf1 to trunk. This shuts up "Non-string key given" exceptions...