2.11 – Unofficial release

Unofficial build of the current state of the upstream repository, plus pull request tasomaniac#97.