Pull request for issue #402

Fixes #402. Generated by conveyor-workflow.