Merge branch 'upgrade_4.1' into 'develop'

VIPSWeb/local_settings_sample.py

VIPSWeb/settings.py

VIPSWeb/templatetags/template_helper.py

VIPSWeb/urls.py

applefruitmoth/urls.py

calculators/urls.py

cerealblotchmodels/locale/nb/LC_MESSAGES/django.po

cerealblotchmodels/urls.py

cydiapomonella/urls.py

forecasts/models.py

forecasts/urls.py

fusarium/urls.py

information/models.py

information/urls.py

mock/urls.py

observations/urls.py

organisms/urls.py

requirements.txt

roughage/urls.py

security/urls.py