Pull request for issue #368

Fixes #368. Generated by conveyor-workflow.