update version number
Merge remote-tracking branch 'upstream/master' into mymod-dev