Merge pull request #2732 from xypron/make