Merge branch 'akpm/master'