Merging back from 'master' to unstable

Don't forget to change these back to `.unstable`.