Merge remote-tracking branch 'origin/master' into mark_folder_as
authorAnton Makeev <Anton.Makeev@jetbrains.com>
Wed, 21 Oct 2015 13:15:22 +0000 (15:15 +0200)
committerAnton Makeev <Anton.Makeev@jetbrains.com>
Wed, 21 Oct 2015 13:15:22 +0000 (15:15 +0200)

Trivial merge