1.6.1 feature
Merge branch 'feature' into release
Merge branch 'release'
Merge branch 'master' of github.com:hys/git-practice