Fix for Django 1.6: model._meta._fields() doesn't exist anymore.
Merge update for django 1.6