Merge branch 'jc/diff' into next

* jc/diff:
diffcore-delta: make change counter to byte oriented again.
diffcore-break: similarity estimator fix.
count-delta: no need for this anymore.