[nvidia-kmod/f36] (9 commits) ...Merge master