I will duplicate this agains bug #1064475 as in case we can get this to upstream version 6.1.0, the changes requested here will be included.
I will duplicate this agains bug #1064475 as in case we can get this to upstream version 6.1.0, the changes requested here will be included.