Pull request for issue #1491

Fixes #1491. Generated by conveyor-workflow.