fix #398
release id b4deaa4377
Merge remote-tracking branch 'origin/master' into 1.4.5