Merging r2341 from trunk