Merge branch 'misc' of .git into next