Requesting a pull to mozillafordevelopment:master from k88hudson:makedrive

Huh... this is an interesting pattern for handling optional callbacks. :+1: