integrate Google map fix (#757) from development branch

See your standing ovations so think we should integrate it into master branch. :wink: