Pull request for issue #1333

Fixes #1333. Generated by conveyor-workflow.