Pull request for issue #1005

Fixes #1005. Generated by conveyor-workflow.