Merge branch 'location_service'
Merge branch 'master' into location_service