Pull request for issue #364

Fixes #364. Generated by conveyor-workflow.