Merge pull request #533 from marcobiedermann/hotfix/version