update version for 3.0pre6 build
Merge remote-tracking branch 'upstream/master' into release-3.0pre6
update version for 3.0pre7dev development