Merge remote-tracking branch 'origin/master' into develop

Author: snipe

config/version.php

@@ -6,5 +6,5 @@
   'prerelease_version' => '',
   'hash_version' => 'g3ab2e2011',
   'full_hash' => 'v8.3.4-149-g3ab2e2011',
-  'branch' => 'develop',
+  'branch' => 'master',
 );