tableized partials
Merge branch 'master' into fix-partials