Version reporting in the package
Merge branch 'master' into py3
Merging master