Pull request for issue #1293

Fixes #1293. Generated by conveyor-workflow.