Fix issue with retrieveClientSettings returning false
Merge branch 'master' of github.com:xionic/Toboggan