Merge remote-tracking branch 'origin/master' into bugfix/9720_apply_corrections_fails_with_older_files
Refs #9720 Better error message.

Also use more appropriate message buttons.
Merge branch 'bugfix/9720_apply_corrections_fails_with_older_files' into develop