Regression test for issue 2842
Merge pull request #2918 from vyv03354/test2842

Regression test for issue 2842
Adds optional Shift for zoom keybindings
Merge pull request #2926 from yurydelendik/shift-zoom

Adds optional Shift for zoom keybindings
Merge remote-tracking branch 'upstream/master'