removing wadostuff giving errors in incremental bug
Merge branch 'master_migrate_django1.5' into test_django1.5