Merge pull request #2255 from xypron/automake