Patch pushed as ca6135b4b66ab5d782ad31a87ec7f9887f995ee8 with a modified commit message. Thanks.