Index: lib/moodlelib.php
===================================================================
--- lib/moodlelib.php	(revision 856)
+++ lib/moodlelib.php	(revision 857)
@@ -4956,6 +4956,13 @@
             $sizelist[] = $CFG->maxbytes;
     }
 
+    // CMDL-1577 Upload limit in my settings (INC0017301)
+    // Allow maxbytes to be selected if it falls outside the above boundaries
+    if( isset($coursebytes) && !in_array($coursebytes, $sizelist) ){
+            $sizelist[] = $coursebytes;
+    }
+    // end CMDL-1577
+
     foreach ($sizelist as $sizebytes) {
        if ($sizebytes < $maxsize) {
            $filesize[$sizebytes] = display_size($sizebytes);
Index: course/edit_form.php
===================================================================
--- course/edit_form.php	(revision 856)
+++ course/edit_form.php	(revision 857)
@@ -158,7 +158,11 @@
         $mform->setHelpButton('showreports', array('coursereports', get_string('activityreport')), true);
         $mform->setDefault('showreports', $courseconfig->showreports);
 
-        $choices = get_max_upload_sizes($CFG->maxbytes);
+        // CMDL-1577 Upload limit in my settings (INC0017301)
+        //$choices = get_max_upload_sizes($CFG->maxbytes);
+        $choices = get_max_upload_sizes($CFG->maxbytes, $course->maxbytes);
+        // end CMDL-1577
+
         $mform->addElement('select', 'maxbytes', get_string('maximumupload'), $choices);
         $mform->setHelpButton('maxbytes', array('courseuploadsize', get_string('maximumupload')), true);
         $mform->setDefault('maxbytes', $courseconfig->maxbytes);