Pull request for issue #418

Fixes #418. Generated by conveyor-workflow.