Merge remote-tracking branch 'refs/remotes/origin/develop' into Issue-#2816-2

diff --cc database.sql
Simple merge

diff --cc include/dbstructure.php
index d3b148b2a8bfbf6b4e3dc83dbe4c7cc5e4e73bd2,32d5986fe97f27398f51b0af1e0a0bd446c2e2ca..d287b5e6d9b9d5c3af02677f84615c0a3d7fd95e
--- 1/include/dbstructure.php
--- 2/include/dbstructure.php
+++ b/include/dbstructure.php
@@@ -1512,11 -1491,24 +1513,27 @@@ function dbstructure_run(&$argv, &$argc
  
        if ($argc==2) {
                switch ($argv[1]) {
 +                      case "dryrun":
 +                              update_structure(true, false);
 +                              return;
                        case "update":
                                update_structure(true, true);
+ 
+                               $build = get_config('system','build');
+                               if (!x($build)) {
+                                       set_config('system','build',DB_UPDATE_VERSION);
+                                       $build = DB_UPDATE_VERSION;
+                               }
+ 
+                               $stored = intval($build);
+                               $current = intval(DB_UPDATE_VERSION);
+ 
+                               // run any left update_nnnn functions in update.php
+                               for($x = $stored; $x < $current; $x ++) {
+                                       $r = run_update_function($x);
+                                       if (!$r) break;
+                               }
+ 
                                set_config('system','build',DB_UPDATE_VERSION);
                                return;
                        case "dumpsql":