Merge branch 'map_double_click_zoom'