Merge remote-tracking branch 'origin/master'
Fixed /udefine failing when receiving multi-word terms