I applied your patch and added your copyright in the corresponding files (r26080). I will make a CMR for the 1.4 and 1.5. However, as you might have noticed we're trying to close the 1.4 and move forward.