Fix table rendering for simple tables
Merge branch 'master' into 2014