README: More details about the branches in this repo.
Merge branch 'master' into measured