Merge branch 'master' into vromanik/doxygen
authorVasily Romanikhin <vasily.romanikhin@jetbrains.com>
Thu, 28 Apr 2016 12:16:54 +0000 (15:16 +0300)
committerVasily Romanikhin <vasily.romanikhin@jetbrains.com>
Thu, 28 Apr 2016 12:16:54 +0000 (15:16 +0300)

Trivial merge