Added suffix to version (pkg_resources compatibility)
Merge pull request #2684 from bittner/support/2.4.x

Added suffix to version (pkg_resources compatibility)
fixes #2679
Merge pull request #2691 from FinalAngel/support/2.4.x

fixes #2679