Merging Django 1.6 changes into branch one-page-configuration.

Merging Django 1.6 changes into branch one-page-configuration.