Pull request for issue #454

Fixes #454. Generated by conveyor-workflow.