fix #209
add test for #209
Merge remote-tracking branch 'origin/master' into master-1.9