Bug 1043723 - Make Marionette work with Mulet+Gaia, r=dburns