Pull request for issue #1015

Fixes #1015. Generated by conveyor-workflow.