trimmed stable release 31.0.1650.63
Merge remote-tracking branch 'origin/feature/colorDocumentMarkers/30.0.1599.101' into feature/colorDocumentMarkers/31.0.1650.63

Conflicts:
	chromium/src/third_party/WebKit/Source/core/platform/graphics/GraphicsContext.cpp