Merge branch 'master' into map_double_click_zoom