Merge pull request #76 from Plonk42/lang_npe

Fix a NPE when LANG is not defined (typically on Windows)
Merge pull request #84 from JetBrains/master

Merge pull request #76 from Plonk42/lang_npe