Update KDiff3 stable branch

Authored by mreeves on Mar 23 2019, 12:18 AM.