django/django — pull request #2695 by Starou (2014-05-21 10:41:16+00:00)
Title: Ticket 16311

Pull request against master branch.