Pull request for issue #889

Fixes #889. Generated by conveyor-workflow.