Fixing typo.
Removed submods
Merge branch 'master' into keyboardBugFixes