Merge branch 'master' into 'search_update'

# Conflicts:
#   setup.py
3 jobs for search_update in 13 seconds (queued for 8 minutes and 40 seconds)