Pull request for issue #1017

Fixes #1017. Generated by conveyor-workflow.