diff --git a/Documentation/config-gerrit.txt b/Documentation/config-gerrit.txt
index 5c6e3e7136..cf231dbff6 100644
--- a/Documentation/config-gerrit.txt
+++ b/Documentation/config-gerrit.txt
@@ -621,6 +621,11 @@ cache `"groups_byinclude"`::
 Caches group inclusions in other groups.  If direct updates are made
 to the `account_group_includes` table, this cache should be flushed.
 
+cache `"groups_members"`::
++
+Caches subgroups.  If direct updates are made to the
+`account_group_includes` table, this cache should be flushed.
+
 cache `"ldap_groups"`::
 +
 Caches the LDAP groups that a user belongs to, if LDAP has been
@@ -1063,8 +1068,7 @@ Setting this too high may cause the JVM to run out of heap space
 when handling very big binary files, such as device firmware or
 CD-ROM ISO images.
 +
-Default is 50 MiB on all platforms.  Prior to Gerrit 2.1.6,
-this value was effectively 2047 MiB.
+Defaults to 25% of the available JVM heap, limited to 2048m.
 +
 Common unit suffixes of 'k', 'm', or 'g' are supported.
 
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/DiffTable.ui.xml b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/DiffTable.ui.xml
index ead90caa8b..e08a25d4e9 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/DiffTable.ui.xml
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/DiffTable.ui.xml
@@ -44,6 +44,7 @@ limitations under the License.
       overflow: hidden;
       border-right: 0;
       width: auto;
+      line-height: normal;
     }
 
     /* Preserve space for underscores. If this changes
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide2.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide2.java
index aca15eb7e8..a8e4df051d 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide2.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide2.java
@@ -157,6 +157,7 @@ public class SideBySide2 extends Screen {
   protected void onInitUI() {
     super.onInitUI();
     setHeaderVisible(false);
+    setWindowTitle(FileInfo.getFileName(path));
   }
 
   @Override