Pull request for issue #927

Fixes #927. Generated by conveyor-workflow.