Pull request for issue #396

Fixes #396. Generated by conveyor-workflow.