Pull request for issue #1087

Fixes #1087. Generated by conveyor-workflow.