Pull request for issue #1387

Fixes #1387. Generated by conveyor-workflow.