Pull request for issue #833

Fixes #833. Generated by conveyor-workflow.