Trying to merge into gh-pages-src

@Cilph, I want to double-check with you that these changes are compatible... the changelog for gh-pages-src says everything is new, which isn't very helpful.