Updates master to django 1.7a2