Fix preview output (catching up to spec changes)
Merge branch 'master' into mtd