fix #613
Merge remote-tracking branch 'origin/master' into googleMaps_debug