Merge remote-tracking branch 'origin/master' into mark_folder_as
authorAnton Makeev <Anton.Makeev@jetbrains.com>
Tue, 10 Nov 2015 16:49:28 +0000 (17:49 +0100)
committerAnton Makeev <Anton.Makeev@jetbrains.com>
Tue, 10 Nov 2015 16:49:28 +0000 (17:49 +0100)

Trivial merge