fix bug #387#388

Open

zhulg wants to merge 2 commits intodaimajia:masterfrom

Commits on Oct 20, 2016

fix bug #387
jasongang
committed

Commits on Apr 7, 2017

Merge branch 'master' into master
zhulg
authored