These fixes should have been applied to head first then backported to 1.1

Now you have to port them to head or they will be lost.

Maintaining several branch is not easy all the time, nevertheless it is the responsability of the developer to do it.