Pull request for issue #784

Fixes #784. Generated by conveyor-workflow.