Merge upstream r825: fix line continuation in whitespace