r19136: No conflict, after "svn up" it applied correctly", merge 19126 from 3_0