Patches pushed as c9524eca895a85d8acbb4c75faa17c397faaffdd and
a02cd9623f1468205d7dee5f7545f4ed76007b4d.
Thanks.