Merge remote-tracking branch 'origin/master'

# Conflicts:
#	addon/core_automation.js
#	addon/core_maintenance.js
#	addon/manifest.json
#	addon/ui/locales/en/help.html
#	addon/ui/options.html