Merge from trunk (r2858)