Pull request for issue #573

Fixes #573. Generated by conveyor-workflow.