Pull request for issue #844

Fixes #844. Generated by conveyor-workflow.