fix consecutive wholeword hl
minified
moved
xMerge remote-tracking branch 'niko/master'
Cleaned tests