Pull request for issue #406

Fixes #406. Generated by conveyor-workflow.