WARNING: DO NOT ACCEPT THIS PULL REQUEST

I'm testing fork syncing through the Github web interface. If all goes well, this will sync my forked repo with the master branch of the jennybc repo. If all goes badly and I've misunderstood this interface, this pull request might be sent to the main repository and try to change it to match my local repository which would be VERY BAD, so again, DO NOT ACCEPT THIS PULL REQUEST unless you happen to be me.