Bring in commit 60abba871203521a28bf7d1727948a92f4fc2cd1 using django orm