Made choice for MySQL or PostgreSQL more explicit
Merge branch 'master' into django-fluent