Release
Merge remote-tracking branch 'origin/master' into mlockall
Edited CHANGES.