Resolve #807 merge conflict

Merged `releases` into `master`.

See #811.