Merge branch '20150805-kill-mtrr-v6' into 20150805-all-pending