Pull request for issue #340

Fixes #340. Generated by conveyor-workflow.