Merge remote-tracking branch 'origin/master'
authorYann Cébron <yann.cebron@jetbrains.com>
Fri, 23 Sep 2016 17:45:43 +0000 (19:45 +0200)
committerYann Cébron <yann.cebron@jetbrains.com>
Fri, 23 Sep 2016 17:45:43 +0000 (19:45 +0200)

Trivial merge