Pull request for issue #398

Fixes #398. Generated by conveyor-workflow.