Merge branch '2964_mouse_in_subshell'