Merge working master to master

Merges working master into master. Now that DEAM 13 has concluded, we can go back to normal merging and releases.

All tests pass.