Pull request for issue #899

Fixes #899. Generated by conveyor-workflow.