Merging into 2.6 wasn't very painful and the code is up and running now. I've even submitted a merge request to upstream!