Pull request for issue #412

Fixes #412. Generated by conveyor-workflow.