Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Thu, 6 Oct 2016 16:33:28 +0000 (19:33 +0300)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Thu, 6 Oct 2016 16:33:28 +0000 (19:33 +0300)

Trivial merge