am daffeb33: Merge change 2594 into donut

Merge commit 'daffeb333e7965eff58161a42de53ca157da4da9'

* commit 'daffeb333e7965eff58161a42de53ca157da4da9':
  new image diffing tool and support for image patches in applypatch