Update from potatolondon/djangae