Merge pull request #4264 from pprindeville/lcdproc-disable-nls