Commit 967e073dca8742d20bc14fd8c62b64b54f9a5326

Edward Thomson 2016-02-27T16:42:02

merge driver: correct global initialization