Fix problem with 'Validate' button in editor - caused failure to save
and please reload message
Merge remote-tracking branch 'upstream/2.10.x' into 2.10.x