Merge remote-tracking branch 'origin/ketant'
Merge https://github.com/rculp/geolocation-plugin into ketant