Merge pull request #1 from nanglin/testbranch

Merge with testbranch data
Merge branch 'testbranch'
revert again
Revert "revert again"

This reverts commit c4a221ab28eb854159cae13fb2b4bbce95c37c54.
Merge branch 'master' into testbranch