Merge branch 'master' into cata

diff --git a/deploy.sh b/deploy.sh
old mode 100644
new mode 100755
diff --git a/tullaCC/cc.lua b/tullaCC/cc.lua
index 9998f21..08cd1aa 100644
--- a/tullaCC/cc.lua
+++ b/tullaCC/cc.lua
@@ -95,7 +95,7 @@ local function Timer_OnUpdate(self, elapsed)
 	else
 		local remain = self.duration - (GetTime() - self.start)
 		if round(remain) > 0 then
-			if (self.fontScale * self:GetEffectiveScale()) < MIN_SCALE then
+			if (self.fontScale * self:GetEffectiveScale() / UIParent:GetScale()) < MIN_SCALE then
 				self.text:SetText('')
 				self.nextUpdate  = 1
 			else