Update version
Merge branch master, module version update
Reset branches