Port GMaps v3 fixes to 1.4.x line