Pull request for issue #913

Fixes #913. Generated by conveyor-workflow.