Patched bug 1030243
Attended Marionette meeting