Merge pull request #2165 from xypron/make