Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master

AUTHORS

@@ -145,4 +145,4 @@ John Cox <johncox@google.com>
 Ben Weeks <benweeks@mit.edu>
 David Bodor <david.gabor.bodor@gmail.com>
 Sébastien Hinderer <Sebastien.Hinderer@inria.fr>
-
+Kristin Stephens <ksteph@cs.berkeley.edu>

common/lib/xmodule/xmodule/split_test_module.py

@@ -21,6 +21,8 @@ log = logging.getLogger('edx.' + __name__)
 
 class SplitTestFields(object):
     """Fields needed for split test module"""
+    has_children = True
+
     user_partition_id = Integer(
         help="Which user partition is used for this test",
         scope=Scope.content

lms/djangoapps/dashboard/views.py

@@ -56,7 +56,7 @@ def dashboard(request):
     # table queries need not take the form of raw SQL, but do in this case since
     # the MySQL backend for django isn't very friendly with group by or distinct
     table_queries = {}
-    table_queries["course enrollments"] = """
+    table_queries["course registrations (current enrollments)"] = """
         select
         course_id as Course,
         count(user_id) as Students

lms/static/sass/multicourse/_dashboard.scss

@@ -390,6 +390,7 @@
 
         img {
           width: 100%;
+          min-height: 100%;
         }
       }