[1.8.x] Fixed a query failure on Python 3.5; refs #23763.

The failure was introduced in Django by
c7fd9b24 and the change in
Python 3.5 is https://hg.python.org/cpython/rev/a3c345ba3563.

Backport of be1357e7 from master