I've now added a unit test [here](https://github.com/django/django/pull/1477/files#diff-f029625970fcf3de7ccd8ea3e7939a08R171) to make sure that this doesn't happen.