fix for Google Maps broke the add comment button

I really do not know why this works for both cases, but it does. So if
either break again, probably this change should be investigated more.
Merge remote-tracking branch 'origin/master' into 1.4.5