@b4n Hey, cool! I would prefer if this pull request could be merged first and then I'd make another for the last 2 year upstream changes. This one is the hard part because it represents something like 12 years of upstream development and I'm worried I'd screw up if I started doing some changes on top of this.