Pull request for issue #790

Fixes #790. Generated by conveyor-workflow.