The source project of this merge request has been removed.
Import 3.6 and other improvements
This MR contains the last of what I thought might be needed for the 3.6 release. I haven't tested it on 3.6 yet, so things like the patches may not cleanly apply, but that can be fixed when the time comes.
Edited by Travis Wrightsman