Bump version numbers
Merge branch 'master' into java7