Requesting a pull to mozillafordevelopment:master from k88hudson:makedrive

A little confused as to why we split this into two modules.