On 13-05-20, 13:10, Georgi Djakov wrote: > There will be a minor conflict with my branch when this is merged upstream, > so maybe we will need to report it or use an immutable tag/branch. Okay, give me your branch and I will rebase over it then. Or if you can do that over my branch, that will be better as mine is just based of rc2. -- viresh