Merged from GitHub.
Merge branch 'master' of https://github.com/Zemke/cwt