Merge remote-tracking branch 'origin/develop'

Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php

config/version.php

@@ -6,5 +6,5 @@ return array (
   'prerelease_version' => '',
   'hash_version' => 'ged8a48672',
   'full_hash' => 'v8.0.3-99-ged8a48672',
-  'branch' => 'develop',
+  'branch' => 'master',
 );