- Merge upstream. Fixes #173