Commit 7a3ab14feec81fd397427b18fa8137e55546e198

Edward Thomson 2016-02-07T15:58:34

merge driver: get a pointer to favor