Merge branch 'master' into nightly

site.conf

@@ -214,7 +214,7 @@
             stable = {
                 name = 'stable',
                 mirrors = {
-                    'http://[fd21:b4dc:4b00::a38:1]/gluon/stable/images/sysupgrade', -- gw01
+                    'http://[fd21:b4dc:4b00::a38:1]/gluon/stable/sysupgrade', -- gw01
                 },
                 good_signatures = 2,
                 pubkeys = {
@@ -226,7 +226,7 @@
             beta = {
                 name = 'beta',
                 mirrors = {
-                    'http://[fd21:b4dc:4b00::a38:1]/gluon/beta/images/sysupgrade', -- gw01
+                    'http://[fd21:b4dc:4b00::a38:1]/gluon/beta/sysupgrade', -- gw01
                 },
                 good_signatures = 1,
                 pubkeys = {
@@ -238,7 +238,7 @@
             nightly = {
                 name = 'nightly',
                 mirrors = {
-                    'http://[fd21:b4dc:4b00::a38:1]/gluon/nightly/images/sysupgrade', -- gw01
+                    'http://[fd21:b4dc:4b00::a38:1]/gluon/nightly/sysupgrade', -- gw01
                 },
                 good_signatures = 1,
                 pubkeys = {