Pull request for issue #937

Fixes #937. Generated by conveyor-workflow.