Merge pull request #955 from Windower/4.1-dev

7/8 Update merge
Shortcuts - Default handling

This will hopefully fix the nil error problem.
Merge pull request #956 from Windower/4.1

4.1