Pull request for issue #1085

Fixes #1085. Generated by conveyor-workflow.