am d83e4f15: support for version 2 of block image diffs

* commit 'd83e4f15890ac6ebe0d61924bd224eb1ae8565ad':
  support for version 2 of block image diffs