Fixed clickable thread watcher "S"
Merge remote-tracking branch 'upstream/master'