MFH (r273273): Merge upstream r825: fix line continuation in whitespace