Merge remote-tracking branch 'origin/branch-5.0'
[disorder] / AUTHORS
1 See the end of README for authorship details.