Prepare CALC for migration to Django 1.10
#1544

toolness wants to merge django-1.10 into develop

We do not currently have an analysis of these two commits