Pull request for issue #1307

Fixes #1307. Generated by conveyor-workflow.