Pull request for issue #835

Fixes #835. Generated by conveyor-workflow.