Merge branch 'gmac-next'