Requesting a pull to mozillafordevelopment:master from k88hudson:makedrive

sure, it's still pretty gross though.. maybe we can revisit later