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' => 'v8.0.3',
-  'full_app_version' => 'v8.0.3 - build 17154-ged8a48672',
-  'build_version' => '17154',
+  'app_version' => 'v8.0.4',
+  'full_app_version' => 'v8.0.4 - build 17196-gc29bdbdac',
+  'build_version' => '17196',
   'prerelease_version' => '',
-  'hash_version' => 'ged8a48672',
-  'full_hash' => 'v8.0.3-99-ged8a48672',
+  'hash_version' => 'gc29bdbdac',
+  'full_hash' => 'v8.0.4-29-gc29bdbdac',
   'branch' => 'master',
 );