Comment 7 for bug 935951

Hi Wajahat

Thanks for fixing this. I didn't test it yet, but based on our discussion it seems this is a correct fix.

It's also good you have submitted a test case so that the same error can not happen again without getting noticed.

Please make a merge proposal against 7.1 branch from that branch. (I will test compile your code when back from traveling.)