Fixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	Epiphany.Web.Extensions/Epiphany.Web.Extensions.csproj