Sync epiphany3 with MC. From MC:

  Fix migration process. Epiphany itself seems to be a bit fragile still.
  It locked up my desktop...