Pull request for issue #839

Fixes #839. Generated by conveyor-workflow.