Merge remote-tracking branch 'origin/master'
authorYann Cébron <yann.cebron@jetbrains.com>
Wed, 8 Jun 2016 08:27:28 +0000 (10:27 +0200)
committerYann Cébron <yann.cebron@jetbrains.com>
Wed, 8 Jun 2016 08:27:28 +0000 (10:27 +0200)

Trivial merge