Merge remote-tracking branch 'origin/master'
authorDaniil Ovchinnikov <daniil.ovchinnikov@jetbrains.com>
Thu, 20 Nov 2014 17:46:41 +0000 (20:46 +0300)
committerDaniil Ovchinnikov <daniil.ovchinnikov@jetbrains.com>
Thu, 20 Nov 2014 17:46:41 +0000 (20:46 +0300)

Trivial merge