fix the homepage again
Merge branch 'master' into new-features