Merge remote-tracking branch 'origin/develop'

Signed-off-by: snipe <[email protected]>

# Conflicts:
#	config/version.php

Author: snipe

config/version.php

@@ -1,10 +1,10 @@
 <?php
 return array (
-  'app_version' => 'v6.3.4',
-  'full_app_version' => 'v6.3.4 - build 13226-g5229dd65c',
-  'build_version' => '13226',
+  'app_version' => 'v6.4.0',
+  'full_app_version' => 'v6.4.0 - build 13351-gdb2baae758',
+  'build_version' => '13351',
   'prerelease_version' => '',
-  'hash_version' => 'g5229dd65c',
-  'full_hash' => 'v6.3.4-85-g5229dd65c',
+  'hash_version' => 'gdb2baae758',
+  'full_hash' => 'v6.4.0-210-gdb2baae758',
   'branch' => 'master',
 );

upgrade.php

@@ -87,7 +87,7 @@ function url_get_contents ($Url) {
 // done fetching requirements
 
 if (!$no_interactive) {
-    $yesno = readline("\nProceed with upgrade? [Y/n]: ");
+    $yesno = readline("\nProceed with upgrade? [y/N]: ");
 } else {
     $yesno = "yes";
 }