fetch diffs via xhr
Merge branch 'master' into diff-xhr
tests pass