git pull test
p2w(v0.8)
Merge branch 'master' into KHM