Works in Django1.6 now