Merge branch 'SOFAConfig' into bender-SOFA-1.0