Merge branch 'bugfixes' into linux-next