Moved the map to the view.
Merged master.
Merged master again.