Merge branch 'master' into version2
reset merge
Merge branch 'version2'