Fix blog index view
Merge branch 'master' into dev