#SCL-6694 {AE at com.intellij.openapi.roots.impl.RootModelImpl.dispose} fixed
Merge remote-tracking branch 'origin/master'