@bamboo: I think you might want to have a look at https://github.com/JetBrains/kotlin/commit/85ebfdda84193fe15bb2f50c413e76256abad368