Merge remote-tracking branch 'origin/master'

Conflicts:
	plugins/carbon_combat.lua
Merge remote-tracking branch 'origin/master'

Conflicts:
	plugins/carbon_combat.lua
Merge remote-tracking branch 'origin/master'

Conflicts:
	plugins/carbon_combat.lua