Merge remote-tracking branch 'origin/master' into mark_folder_as
authorAnton Makeev <Anton.Makeev@jetbrains.com>
Thu, 26 Nov 2015 15:46:53 +0000 (16:46 +0100)
committerAnton Makeev <Anton.Makeev@jetbrains.com>
Thu, 26 Nov 2015 15:46:53 +0000 (16:46 +0100)

Trivial merge