pick: 1.7.0 -> 1.9.0
(cherry picked from commit f43baf94a3d323a4410e28a7db35c96fb62b7765)
authored by Kranium Gikos Mendoza and committed by Robin Gloster 8 years ago 8a3d960b 9c6cabe7