Pull request for issue #736

Fixes #736. Generated by conveyor-workflow.