Merge remote-tracking branch 'origin/master'
authorYann Cébron <yann.cebron@jetbrains.com>
Mon, 24 Aug 2015 11:03:16 +0000 (13:03 +0200)
committerYann Cébron <yann.cebron@jetbrains.com>
Mon, 24 Aug 2015 11:03:16 +0000 (13:03 +0200)

Trivial merge