Pull request for issue #356

Fixes #356. Generated by conveyor-workflow.