Pull request for issue #310

Fixes #310. Generated by conveyor-workflow.