Updated epiphany from upstream