Update to support Django 1.7 and master