Merge in branch 'location_manager', edit comments
Merge branch 'location_manager'