Merge branch 'master' into release
Merge branch 'release' into development
Merge remote-tracking branch 'origin' into release
Merge remote-tracking branch 'ding2tal/release' into ding2-master