Pull request for issue #480

Fixes #480. Generated by conveyor-workflow.