Sorry, I've run some additional tests and one more nit showed up.
When this is fixed, I can merge it instantly :)

Actually, it seemed fairer to do it myself.

Patch set 9:Code-Review +2

View Change

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