Release v3.1.0

Stuff that needs sorting out, before this can be pulled:

- [ ] #2065
- [ ] #2062 (fixes #1835)
- [ ] #2052 
- [ ] maybe #2040

Changelog short version is here: https://gist.github.com/marcelklehr/8586848