Merge pull request #5234 from jtbandes/reflow-cursor-line #13

Job	Run time
build	1m 16s
lint	3m 27s
test-integration (18, ubuntu, chromium)	3m 49s
test-unit (18, ubuntu)	1m 48s
test-integration (18, ubuntu, firefox)	3m 56s
test-unit (18, macos)	4m 17s
test-integration (18, ubuntu, webkit)	3m 11s
test-unit (18, windows)	6m 32s
test-unit-coverage	1m 2s
release-dry-run (18)	2m 6s
	31m 24s

Provide feedback