Pull request for issue #466

Fixes #466. Generated by conveyor-workflow.