updated marionette to 1.2.2