Bring in changes for kernel 3.15.3