Making the column titles match the column values
Merge branch 'master' into browser-content-fix-2