Merge pull request #1054 from sipa/buildinfo