Pull request for issue #827

Fixes #827. Generated by conveyor-workflow.