Merge branch 'akpm-current/current'