Update to latest IntelliJ version (12.0.4)
Merge branch 'master' into idea
Update to latest IntelliJ version (12.0.4)