added Okular; pulled from master