Commit a5bf599c9d2bd934823fbd99e73d6378289e5dfb

Edward Thomson 2015-04-17T12:32:39

Merge pull request #3047 from git-up/diff_fixes Diff fixes