Merge pull request #1732 from paulfertser/fix-openocd-nls-mk