RBT 2: Increment version.
Merge branch 'master' into rebase-test