Merge branch 'develop' into feature/gpm

system/src/Grav/Common/Page/Media.php

@@ -56,6 +56,9 @@ class Media extends Getters
                 continue;
             }
 
+            //set file size
+            $medium->set('size',$info->getSize());
+
             // Assign meta files to the medium.
             if ($meta) {
                 $medium->addMetaFile($meta);

system/src/Grav/Common/Uri.php

@@ -218,7 +218,10 @@ class Uri
      *
      * @return String The extension of the URI
      */
-    public function extension() {
+    public function extension($default = null) {
+        if (!$this->extension) {
+            $this->extension = $default;
+        }
         return $this->extension;
     }