From: Dmitry Trofimov <dmitry.trofimov@jetbrains.com>
Date: Tue, 18 Oct 2016 19:13:22 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: idea/171.216~5
X-Git-Url: https://git.jetbrains.org/?p=idea%2Fcommunity.git;a=commitdiff_plain;h=8035e19e74d24fe564ed502659ad8f1f770ed928

Merge remote-tracking branch 'origin/master'
---

8035e19e74d24fe564ed502659ad8f1f770ed928