Merge pull request #930 from sipa/minireorg