[xminus] update tkn extraction regex
Merge pull request #4338 from t0mm0/x-minus-fix

[xminus] update tkn extraction regex
[bbccouk] Fix extraction (#4104, #4214)
Merge remote-tracking branch 'upstream/master'