Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Fri, 2 Dec 2016 09:32:50 +0000 (12:32 +0300)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Fri, 2 Dec 2016 09:32:50 +0000 (12:32 +0300)

Trivial merge