Pull request for issue #420

Fixes #420. Generated by conveyor-workflow.