Pull request for issue #468

Fixes #468. Generated by conveyor-workflow.