[1.3.4] Hopefully fixed a lot of false positives; only tested with AutoSoup from Huzuni client
Merge remote-tracking branch 'origin/master'