Pull request for issue #1495

Fixes #1495. Generated by conveyor-workflow.