Patch Set 3: I would prefer that you didn't submit this

this change is heading for stable-1.1 but it is based on I107713ad which is heading for master, so either include the latter also in stable-1.1 or rebase the other two commits onto stable-1.1