Merge remote-tracking branch 'origin/master'
authorYann Cébron <yann.cebron@jetbrains.com>
Wed, 9 Dec 2015 19:07:48 +0000 (20:07 +0100)
committerYann Cébron <yann.cebron@jetbrains.com>
Wed, 9 Dec 2015 19:07:48 +0000 (20:07 +0100)

Trivial merge