Merge latest into release branch

Some template changes are required for release. Instead of cherry-picking them out, let's just merge current master. The only changes that aren't required are the .travis.yml lines, which clearly don't affect releasing.