Pull request for issue #931

Fixes #931. Generated by conveyor-workflow.