Updates to latest opensim master