Auto-Merge pull request #2517 from trustchk/aix