Merge branch 'branch-5.0' into release
[disorder] / ChangeLog
1 See version control history for detailed change information.
2