xMerge branch 'master' into sr6
Merge branch 'sr6' of https://github.com/mcneel/rhinocommon into sr6