Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Fri, 7 Oct 2016 10:28:00 +0000 (13:28 +0300)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Fri, 7 Oct 2016 10:28:00 +0000 (13:28 +0300)

Trivial merge