Sync'ed dev with master after Django/static merge