Merge remote-tracking branch 'webkit-org/master'

Conflicts:
	Source/WebCore/editing/Editor.cpp
	Source/WebCore/loader/HistoryController.cpp
	Source/WebCore/platform/network/curl/CookieJarCurl.cpp
	Source/WebCore/platform/network/curl/SocketStreamHandle.h
	Source/WebCore/platform/network/curl/SocketStreamHandleCurl.cpp