[MERGE] merged latest bugfixes from 6.0 into trunk (up to rev 4375)