Pull request for issue #482

Fixes #482. Generated by conveyor-workflow.