8/1 master -> stable round 2

Fired the last pull request too early :(