Merge branch 'devel'
Updated ChangeLog.
Fix potential crash on server stop.
Merge branch 'master' into devel
Merge branch 'fixes-v232' into devel