Pull request for issue #815

Fixes #815. Generated by conveyor-workflow.