Merge branch 'hugepages'