Pull request for issue #929

Fixes #929. Generated by conveyor-workflow.