Added Timeout option to geolocation to help stop geolocation errors
Merge remote-tracking branch 'origin/master'
Added Timeout option to geolocation to help stop geolocation errors.