Merge branch 'master' into uta-python
authorAlexey Utkin <alexey.utkin@jetbrains.com>
Tue, 29 Dec 2015 17:25:05 +0000 (20:25 +0300)
committerAlexey Utkin <alexey.utkin@jetbrains.com>
Tue, 29 Dec 2015 17:25:05 +0000 (20:25 +0300)

Trivial merge