Merge r31688 from trunk: * r31688 Regression test for - the already approved - r31685. Votes: +1: lgo, epg