felixge: you should just cherry-pick their commits!