Merge branch 'supermaster' into bomi1012
xml  newline delete
Merge branch 'bomi1012' into supermaster