Merge remote-tracking branch 'thomas/master'
Merge branch 'master' of github.com:liuhongchao/edts-with-rte