Merge pull request #4280 from jmarshallnz/settings_cleanup