Pull latest CMU master

Watch out, @john.bunn merged in the bugfix for truncating files into our dev and this is also fixed upstream, so this may be interesting. It would be great if whoever does this documents their process here. Presumably it should follow the approach laid out in our git document... let's see ;)