ChangeLog entry for bug #3918
Merge branch 'MAINT_4_0_1' into QA_4_0