Pull request for issue #965

Fixes #965. Generated by conveyor-workflow.