Updated Marionette to rc6