bug: ie11 fontstyle error
Merge branch 'RB-7.4.0' into bug-ie11fontstyle
bug: ie11 fontstyle error
Merge remote-tracking branch 'origin/RB-7.4.0' into bug-ie11fontstyle

Conflicts:
	daumeditor/js/trex/canvas.js
ie doctype bug fix
refactor
Merge branch 'RB-7.4.0' into bug-ie11fontstyle