[Bug 812972] Implement new geo location logic [r=crdlc]
Merge pull request #7554 from EverythingMe/geo-fix

[Bug 812972] Implement new geo location logic [r=crdlc]
Auto-merge from branch 'master'