Merge pull request #3452 from ethomson/0.23_xdiff

0.23 xdiff