Update ivysettings.xml
Merge branch 'master' into devel