Merge branch 'development' into release
Merge branch 'release' of github.com:ding2tal/ding2 into release