02c8b20 cleanup merged patch

Authored and Committed by remi 6 years ago
    cleanup merged patch