Google Maps Bugfix
Merge origin/master