Pull request for issue #764

Fixes #764. Generated by conveyor-workflow.