diff --git a/lib/upgradelib.php b/lib/upgradelib.php
index 6b94aef3c01..54001fc90ee 100644
--- a/lib/upgradelib.php
+++ b/lib/upgradelib.php
@@ -2453,6 +2453,12 @@ function upgrade_install_plugins(array $installable, $confirmed, $heading='', $c
  */
 function check_libcurl_version(environment_results $result) {
 
+    if (!function_exists('curl_version')) {
+        $result->setInfo('cURL PHP extension is not installed');
+        $result->setStatus(false);
+        return $result;
+    }
+
     // Supported version and version number.
     $supportedversion = 0x071304;
     $supportedversionstring = "7.19.4";
diff --git a/repository/dropbox/classes/legacy.php b/repository/dropbox/classes/legacy.php
index 8dc34248ba9..3e38456f4f0 100644
--- a/repository/dropbox/classes/legacy.php
+++ b/repository/dropbox/classes/legacy.php
@@ -651,4 +651,26 @@ class repository_dropbox_legacy extends repository {
             } catch (moodle_exception $e) {}
         }
     }
+
+    /**
+     * Get dropbox options
+     * @param string $config
+     * @return mixed
+     */
+    public function get_option($config = '') {
+        if ($config === 'dropbox_key') {
+            return trim(get_config('dropbox', 'dropbox_key'));
+        } else if ($config === 'dropbox_secret') {
+            return trim(get_config('dropbox', 'dropbox_secret'));
+        } else if ($config === 'dropbox_cachelimit') {
+            return $this->max_cache_bytes();
+        } else {
+            $options = parent::get_option();
+            $options['dropbox_key'] = trim(get_config('dropbox', 'dropbox_key'));
+            $options['dropbox_secret'] = trim(get_config('dropbox', 'dropbox_secret'));
+            $options['dropbox_cachelimit'] = $this->max_cache_bytes();
+        }
+
+        return $options;
+    }
 }
diff --git a/version.php b/version.php
index 4ab185eb5db..ef026679b3c 100644
--- a/version.php
+++ b/version.php
@@ -29,11 +29,11 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$version  = 2015111607.01;              // 20151116      = branching date YYYYMMDD - do not modify!
+$version  = 2015111607.02;              // 20151116      = branching date YYYYMMDD - do not modify!
                                         //         RR    = release increments - 00 in DEV branches.
                                         //           .XX = incremental changes.
 
-$release  = '3.0.7+ (Build: 20161125)'; // Human-friendly version name
+$release  = '3.0.7+ (Build: 20161129)'; // Human-friendly version name
 
 $branch   = '30';                       // This version's branch.
 $maturity = MATURITY_STABLE;             // This version's maturity level.