KT-4153 Fixed.
Merge branch 'upstream' of git://github.com/mhshams/kotlin
Clean up deprecation