Pull request for issue #360

Fixes #360. Generated by conveyor-workflow.