Merge branch 'stable-1.0' into stable-1.1

This commit is contained in:
2019-12-07 18:37:45 +01:00