Changes from upstream so you can work on the CAML paper...

hi @hisakonog here is a PR with all the changes and some updates to the CAML paper, should I start proof reading the whole thing, or are you working on your sections today and tomorrow?