Merge remote-tracking branch 'origin/master'
authorYann Cébron <yann.cebron@jetbrains.com>
Wed, 17 Aug 2016 15:36:33 +0000 (17:36 +0200)
committerYann Cébron <yann.cebron@jetbrains.com>
Wed, 17 Aug 2016 15:36:33 +0000 (17:36 +0200)

Trivial merge