Merge branch 'master' into SupportMenu

diff --cc README.md
Simple merge

diff --cc mac/org.mozilla.firefox.plist
index 89f5e28609f494ab96d443c55c7ab2d09f4fc328,699245d3b9bd70cae8beff5ab4bb6cb4583e52ac..8405a891734573c507b6a1b0b037aaa72bd2543d
--- 1/mac/org.mozilla.firefox.plist
--- 2/mac/org.mozilla.firefox.plist
+++ b/mac/org.mozilla.firefox.plist
@@@ -341,18 -341,9 +341,18 @@@
                <key>NAME_OF_DEVICE</key>
                <string>PATH_TO_LIBRARY_FOR_DEVICE</string>
        </dict>
-       <key>SSLMinVersion</key>
+       <key>SSLVersionMin</key>
        <string>tls1.2</string>
-       <key>SSLMaxVersion</key>
+       <key>SSLVersionMax</key>
        <string>tls1.3</string>
 +      <key>SupportMenu</key>
 +      <dict>
 +              <key>Title</key>
 +              <string>Click here for help</string>
 +              <key>URL</key>
 +              <string>http://example.edu/</string>
 +              <key>AccessKey</key>
 +              <string>C</string>
 +      </dict>
  </dict>
  </plist>

diff --cc windows/firefox.admx
Simple merge