Merge branch 'master' into new_zoom_buttons_panel