Merge branch 'master' into 'option_near_tafforensis'

# Conflicts:
#   nabu/__init__.py
2 jobs for option_near_tafforensis in 7 minutes and 34 seconds (queued for 8 minutes and 37 seconds)