Use matchaddpos() if possible
Merge branch 'matchaddpos'