Merge pull request #895 from aliceh/upstream-merge

Renamed KOALA directory.