visit roll v2.5.2
visit roll for v2.5.2
fixed README.md conflict
temporary remove of README.md
Merge remote branch 'upstream/master'