try harder to be semver correctly
Merge remote-tracking branch 'origin/master'