Pull request for issue #384

Fixes #384. Generated by conveyor-workflow.