Merge pull request #1295 from aparcar/keep_settings