Fix paths in discovery exception.
Merge branch 'master' into package-translations