3cc3ad2b9e
https://github.com/JetBrains/kotlin/pull/978 (cherry picked from commit fdd5ba7)
https://github.com/JetBrains/kotlin/pull/978 (cherry picked from commit fdd5ba7)