Nilus initial.
Merge pull request #6692 from beheim/master

Nilus initial.