Pull request for issue #478

Fixes #478. Generated by conveyor-workflow.