Diffusion Kate 248a727afba4

add remove-trailing-spaces, merge Boolean True/False

Authored by dhaumann.