Merge nightly branch into master
As far as I know, the changes on the nightly branch have sufficiently matured to be merged onto master. I plan to do this on February 1. Please object if you still need the master branch in its current stage! @theos, OK with you?