Merge branch 'fix-wrong-version-number'