Upgraded marionette to ~2.2.1.