Merge remote-tracking branch 'origin/gaohai'
Merge branch 'master' of https://github.com/highsea/datamavin