Pull request for issue #326

Fixes #326. Generated by conveyor-workflow.