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.2',
-  'full_app_version' => 'v6.3.2 - build 12875-g21ad7f549',
-  'build_version' => '12875',
+  'app_version' => 'v6.3.3',
+  'full_app_version' => 'v6.3.3 - build 12903-g0f63fa23e',
+  'build_version' => '12903',
   'prerelease_version' => '',
-  'hash_version' => 'g21ad7f549',
-  'full_hash' => 'v6.3.2-39-g21ad7f549',
+  'hash_version' => 'g0f63fa23e',
+  'full_hash' => 'v6.3.3-67-g0f63fa23e',
   'branch' => 'master',
 );