Late bugfixes

[seefood]

Another pre-release, covering issues found in 3.1.0
Please keep testing, so we can make this an official release in about a week.

---

This discussion was created from the release Late bugfixes.