Using SQLite in development and MySQL in production by default
Merge branch '2.3.x'