Part. fix for #SCL-6944 {Plugin doesn't recognize Scala 2.11's libraries}
i18n support refactoring
Small optimisation for i18n
Merge remote-tracking branch 'origin/master'