Upgrade Marionette to v1.6.4