IDEA-99818 NPE in common proxy (sometimes file:// url is passed from IDEA wihout host)
Merge remote branch 'origin/master'