Merge branch 'master' into map_api