Merge (some of) trunk -> 0.9