Merge branch 'master' into develop
Initial commit for "New Location" feature.