Merge branch 'master'
Bump version for the next snapshot.