Pull request for issue #1391

Fixes #1391. Generated by conveyor-workflow.