We're still messy with our releases

Pulling changes merged directly to `release-0.11` into `develop`