Pull request for issue #476

Fixes #476. Generated by conveyor-workflow.