Backport aab2c5976a985081b0589d067c906836296a6bfc. Fixes #187.
2 files changed