Pull request for issue #967

Fixes #967. Generated by conveyor-workflow.