Pull request for issue #1323

Fixes #1323. Generated by conveyor-workflow.