Move to new version number scheme to conform with Atmosphere requirements
Merge branch 'release/3.0.2-1d' into develop