Merge branch 'develop'
Merge branch 'develop'
fixing the version attribute which can only be X.Y and not X.Y.Z
Merge branch 'master' into develop