From: Dmitry Trofimov <dmitry.trofimov@jetbrains.com>
Date: Mon, 14 Nov 2016 14:17:19 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: clion/171.962~3
X-Git-Url: https://git.jetbrains.org/?p=idea%2Fcommunity.git;a=commitdiff_plain;h=1cf3085cc9d628d356e4cfeaa23c3034330a64ef;hp=-c

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

1cf3085cc9d628d356e4cfeaa23c3034330a64ef