Feature/17139

Testing changes necessary for django 1.7