Merge in commits from opensim master