Merge changes from the official libvoikko packages