Merge branch 'master' into noc-django-1.5

9 jobs for noc-django-1.5 in 23 minutes and 15 seconds (queued for 3 seconds)