Patch Set 1:
Nico, can you rebase so we can get this merged please?
It doesn't apply cleanly, I don't have the time, sorry.
Please take over if you want.

Of course Nico. Thanks for taking the time for the original patch! I hope you don't mind, I modified the commit message slightly to reflect how the issue got in and to note where the issue came from in the original patch.

To view, visit change 40626. To unsubscribe, or for help writing mail filters, visit settings.