added 0-9 and - to locator path regex
Merge remote-tracking branch 'origin/master'