Diffusion KIO 9e104dd17d69

Fix merge error committed by accident

Authored by ngraham on Aug 6 2018, 10:35 PM.