fix #323
release id 818c84999b
Merge remote-tracking branch 'origin/master' into 1.4.5