Imported Upstream version 0+git201311080218-a419da7
Merge tag 'upstream/0+git201311080218-a419da7'

Upstream version 0+git201311080218-a419da7
Fix "does not work with python-django in testing and unstable" with new upstream version 0.11.0 (Closes: #726011)