Pull request for issue #1299

Fixes #1299. Generated by conveyor-workflow.