Pull request for issue #1325

Fixes #1325. Generated by conveyor-workflow.