Pull request for issue #408

Fixes #408. Generated by conveyor-workflow.