Merging r774:778 from trunk into branches/0.3. Forwardporting hopefully the last...