906e29ed96
This affects both trunk and 1.7 and might affect 1.6. cmr:v1.7 This commit was SVN r27562.
This affects both trunk and 1.7 and might affect 1.6. cmr:v1.7 This commit was SVN r27562.