Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
iOS: Fixed keyboard issues
Merge pull request #1107 from mfleisz/iosfix

iOS: Fixed keyboard issues