Support AMD
Merge branch 'master' into amd