Add pessimistic versioning
Merge branch 'master' into stable