Pull request for issue #388

Fixes #388. Generated by conveyor-workflow.