Merge commit '640b44a070951696bbeb39e0ddac1c7aa861e35d' * commit '640b44a070951696bbeb39e0ddac1c7aa861e35d': Use a diff that ignores trailing whitespaces to get by some layout test failures.
Merge commit '640b44a070951696bbeb39e0ddac1c7aa861e35d' * commit '640b44a070951696bbeb39e0ddac1c7aa861e35d': Use a diff that ignores trailing whitespaces to get by some layout test failures.