Pull request for issue #558

Fixes #558. Generated by conveyor-workflow.