Merge pull request #1159 from intelfx/work/repo-parse-trim-ext