Some django17 love. See #25