Fixed warning that wasn't showing up
Merge branch 'master' into kernel_update_permanent_fix