Quick fix for SQL fixtures
Merge branch 'master' into live