Merge branch 'master' of git@gitlab.com:rootmodels/OpenSimRoot.git into fixesForManual