ChangeLog entry for Improved protection against cross framing
Merge branch 'MAINT_4_0_5' into QA_4_0