Merge pull request #1 from Rythal/master

Routine sync with main carbonite