Pull request for issue #788

Fixes #788. Generated by conveyor-workflow.