Patch pushed as d244282b698087bb6f6cf3c1c4d57b7a5e2e8ffa.
Thanks.