Merge branch 'master' of /Users/develar/settings-repository--