Pull request for issue #730

Fixes #730. Generated by conveyor-workflow.