Fix #450, fix #452: No more crashes because of tuple/list problems with ModelAdmin extensions
Merge branch 'master' into next

* master:
  Fix #450, fix #452: No more crashes because of tuple/list problems with ModelAdmin extensions