Merging back from 'master' to unstable

I deliberately didn't change those to ```.unstable```. Except for the last release, historically, we've always dropped the ```unstable``` in the ```shared``` repo, simply because it is much easier while making a release.