Bump canary to version 6.
Merge pull request #1733 from darktears/bump-6

Bump canary to version 6.