Commit 3f7d3df1ecc0ed7c31427aa37a8de62026c7edef

Edward Thomson 2016-02-27T16:57:12

merge driver: improve inline documentation