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.0',
-  'full_app_version' => 'v6.3.0 - build 12490-g9136415bb',
-  'build_version' => '12490',
+  'app_version' => 'v6.3.1',
+  'full_app_version' => 'v6.3.1 - build 12672-g00cea3eb3',
+  'build_version' => '12672',
   'prerelease_version' => '',
-  'hash_version' => 'g9136415bb',
-  'full_hash' => 'v6.3.0-729-g9136415bb',
+  'hash_version' => 'g00cea3eb3',
+  'full_hash' => 'v6.3.1-180-g00cea3eb3',
   'branch' => 'master',
 );