[wl-kmod/el7: 86/86] Merge branch 'master' into el7