merge content.html changes from 0.8-preview into 0.8-simplex