Merge remote-tracking branch 'origin/master'
authorDmitry Avdeev <dmitry.avdeev@jetbrains.com>
Fri, 29 Apr 2016 16:27:27 +0000 (19:27 +0300)
committerDmitry Avdeev <dmitry.avdeev@jetbrains.com>
Fri, 29 Apr 2016 16:27:27 +0000 (19:27 +0300)

Trivial merge