Merge branch ultimate:plugins/yaml into community
authorValentin Fondaratov <valentin.fondaratov@jetbrains.com>
Mon, 11 Jan 2016 17:18:51 +0000 (20:18 +0300)
committerValentin Fondaratov <valentin.fondaratov@jetbrains.com>
Mon, 11 Jan 2016 17:18:51 +0000 (20:18 +0300)

Trivial merge