PyCharm 3.1.1
Merge remote-tracking branch 'origin/133' into 133