Merge pull request #6170 from annando/safe-save