Pull request for issue #488

Fixes #488. Generated by conveyor-workflow.