merge patch-slovenian