Pull request for issue #1095

Fixes #1095. Generated by conveyor-workflow.