releng
Merge branch 'master' into HEAD
increment the version number for next release
bring in the changes made in the release branch