Merge branch 'master' into 'fix_celery'

# Conflicts:
#   ippisite/ippisite/decorator.py
5 jobs for fix_celery in 11 minutes and 15 seconds (queued for 4 seconds)