Tracks branch-0.7, adding various outstanding pull requests and patches