Merge remote-tracking branch 'origin/master' into feature/9970_refactor_project_serialisation

Refs #9970
Refs #9970 Do not save a blank script window
Merge branch 'feature/9970_refactor_project_serialisation' into develop