- Merge upstream. Fixes #104