Pull request for issue #925

Fixes #925. Generated by conveyor-workflow.