[kwave/f25] (2 commits) ...Update to 17.04.2