Merge pull request #7850 from commodo/netatalk