Sami -> Giella
Merge branch 'master' into stable