Django 1.5-compatible {% url %} syntax in templates.
Merge branch 'develop' into python3