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

this change needs to be cherry-picked onto stable-1.1 as it is based on a commit which was submitted to master and isn't available in stable-1.1

will do that in a minute