Merge remote-tracking branch 'origin/master' into set_row_height_explicitly

diff --cc src/xterm.js
index 3ace764ca36135be72dcfe73125d88cc11278776,a476fd7eb0973bc7deacd9a5efb0e4ca9f65dd04..ea4b3535176a06de2ea6a62016d4a522e9bba54b
--- 1/src/xterm.js
--- 2/src/xterm.js
+++ b/src/xterm.js
@@@ -760,11 -776,10 +776,11 @@@ Terminal.loadAddon = function(addon, ca
   * Updates the helper CSS class with any changes necessary after the terminal's
   * character width has been changed.
   */
- Terminal.prototype.updateCharSizeCSS = function() {
+ Terminal.prototype.updateCharSizeStyles = function() {
    this.charSizeStyleElement.textContent =
        `.xterm-wide-char{width:${this.charMeasure.width * 2}px;}` +
 -      `.xterm-normal-char{width:${this.charMeasure.width}px;}`;
 +      `.xterm-normal-char{width:${this.charMeasure.width}px;}` +
 +      `.xterm-rows > div{height:${this.charMeasure.height}px;}`;
  }
  
  /**