Catch up to spec changes
Merge branch 'master' into mtd