Added check to ensure the correct location provider is used when getting the location.
Merge remote-tracking branch 'origin/master'