Manually merged from 5_20 release branch.
Authored by: seanz 2015-02-11
Parent: [r8046]
Child: [r8048]