Added extra tag search path
Merge branch 'master' into mac-os-x