Merge remote-tracking branch 'origin/master'
authorDmitry Jemerov <yole@jetbrains.com>
Tue, 25 Apr 2017 13:11:57 +0000 (15:11 +0200)
committerDmitry Jemerov <yole@jetbrains.com>
Tue, 25 Apr 2017 13:11:57 +0000 (15:11 +0200)

Trivial merge