version, versioning
Merge branch 'current'