Patch no-matching-Site problem.

The site name will likely be wrong, but at least this fixes the server error.
Merge remote-tracking branch 'origin/master' into django_15