Pull request for issue #953

Fixes #953. Generated by conveyor-workflow.