Pull request for issue #945

Fixes #945. Generated by conveyor-workflow.