Cut release candidate

from Stanford-Online:master
into Stanford-Online:rc

cms/templates/base.html

@@ -322,6 +322,11 @@
       <%static:include path="js/system-feedback.underscore" />
     </script>
 
+    <script type="text/javascript">
+        // TODO: Remove this!
+        // This is a stop-gap "fix" to silence a Studio exception.
+        function setupFullScreenImage(){}
+    </script>
 
     % if context_course:
         <script type="text/javascript">

common/templates/emails/default_post_enrollment_message.txt

@@ -11,7 +11,7 @@ more information.
 
 Have more questions?  Please visit the course's About page or review some
 frequently asked questions in the Help Center at
-https://stanfordonline.zendesk.com/hc/en-us.  Or, send the Stanford Online
+https://stanfordonline.zendesk.com, or send the Stanford Online
 course support team a message by clicking on the Help tab that displays on all
 https://class.stanford.edu pages.
 

common/templates/emails/default_pre_enrollment_message.txt

@@ -14,7 +14,7 @@ for more information, such as when the course will start, and what topics will
 be covered in the course.
 
 Have more questions?  Please visit the Help Center at
-https://stanfordonline.zendesk.com/hc/en-us, or send the Stanford Online course
+https://stanfordonline.zendesk.com, or send the Stanford Online course
 support team a message by clicking on the Help tab that displays on all
 https://class.stanford.edu pages.