making version number follow PEP396
Merge branch 'pep396' into merged