Pull request for issue #456

Fixes #456. Generated by conveyor-workflow.