Address pending deprecation of Model._meta.module_name in Django 1.6
Merge branch '_django1.6_model_name'