Merge remote-tracking branch 'origin/master'
authorMikhail Golubev <mikhail.golubev@jetbrains.com>
Thu, 18 Feb 2016 16:16:36 +0000 (19:16 +0300)
committerMikhail Golubev <mikhail.golubev@jetbrains.com>
Thu, 18 Feb 2016 16:16:36 +0000 (19:16 +0300)

Trivial merge