Update to latest Django Security release

Details are available at https://www.djangoproject.com/weblog/2014/may/14/security-releases-issued/
Merge branch 'master' into develop