ported some hard-to-merge cherries back to trunk :-/