Merge the good stuff into the master branch.