Pull request for issue #939

Fixes #939. Generated by conveyor-workflow.