Pull request for issue #959

Fixes #959. Generated by conveyor-workflow.