pushing the MapView changes.
Merge branch 'master' into second_merge