Pull request for issue #1493

Fixes #1493. Generated by conveyor-workflow.