Pull request for issue #987

Fixes #987. Generated by conveyor-workflow.