Merge remote-tracking branch 'origin/master'
authorYann Cébron <yann.cebron@jetbrains.com>
Fri, 19 Jun 2015 13:57:49 +0000 (15:57 +0200)
committerYann Cébron <yann.cebron@jetbrains.com>
Fri, 19 Jun 2015 13:57:49 +0000 (15:57 +0200)

Trivial merge