Fixing development version number after merge from master
Fixing detection tests after changing Requirement class
Merge branch 'master' into develop
Changing test method from assertIsNone to assertTrue(x is None) for compatability with Python 2.6