Remove nao_common (replaced)
Merge pull request #2480 from ahornung/patch-28

Remove nao_common (replaced)