Merge branch 'vlan/python-fixes'
authorAndrey Vlasovskikh <andrey.vlasovskikh@jetbrains.com>
Wed, 1 Jul 2015 17:57:19 +0000 (20:57 +0300)
committerAndrey Vlasovskikh <andrey.vlasovskikh@jetbrains.com>
Wed, 1 Jul 2015 17:57:19 +0000 (20:57 +0300)

Trivial merge