Pull request for issue #1023

Fixes #1023. Generated by conveyor-workflow.