r5436: small merges from trunk