Pull request for issue #792

Fixes #792. Generated by conveyor-workflow.