Commit ac69a82358ef444de433a8e0af62a4b6bd5c2c4e

Edward Thomson 2015-10-06T00:21:28

Merge pull request #3451 from ethomson/xdiff xdiff fixes