Merge pull request #2824 from xen0l/rebuild