fix bad syntax
Merge branch 'master' into feature/slugs