Pull request for issue #1115

Fixes #1115. Generated by conveyor-workflow.