Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Fri, 21 Oct 2016 16:19:57 +0000 (18:19 +0200)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Fri, 21 Oct 2016 16:19:57 +0000 (18:19 +0200)

Trivial merge