Merge branch 'release-2.1.2'
Merge branch 'release-2.1.3'
Fix version number

Version number was updated in the spec file but not in the python library.
Merge branch 'fix-version-in-init.py' into dev