Merge branch 'master' into uta-python
authorAlexey Utkin <alexey.utkin@jetbrains.com>
Tue, 12 Jan 2016 09:47:31 +0000 (12:47 +0300)
committerAlexey Utkin <alexey.utkin@jetbrains.com>
Tue, 12 Jan 2016 09:47:31 +0000 (12:47 +0300)
# Conflicts:
# python/src/com/jetbrains/python/run/PythonCommandLineState.java


Trivial merge