Adapted augmented_diff to dynamic augmented diffs.
Delta updates: fixed a critical bug.
Merge branch 'master' into onthefly-augmented-diffs