fix bugs in \<Space>
Merge remote-tracking branch 'upstream/master'