Pull request for issue #829

Fixes #829. Generated by conveyor-workflow.