Pull request for issue #999

Fixes #999. Generated by conveyor-workflow.