Merge branch 'master' into udev-keycodes

This merges `master` into `udev-keycodes`.  I also created a tag on this commit called `v2.10beta` and uploaded a corresponding package to the AUR.  (Find it [here](https://aur.archlinux.org/packages/think-rotate/).)  If you bring the tag over to your GitHub repository, I can redirect the AUR package to download from there.  (I have it downloading from my repo right now because the `v2.10beta` tag is only in my repo.)