Merge branch 'master' into zoom_button_drag