typo
ipad support fix
Merge remote-tracking branch 'upstream/master'
Merge pull request #280 from jpecht/master

ipad support fix