[wl-kmod/el7] (3 commits) ...Merge branch 'master' into el7