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.2.0',
-  'full_app_version' => 'v8.2.0 - build 19055-g6e56d5613',
-  'build_version' => '19055',
+  'app_version' => 'v8.2.1',
+  'full_app_version' => 'v8.2.1 - build 19068-g6ca49a20c',
+  'build_version' => '19068',
   'prerelease_version' => '',
-  'hash_version' => 'g6e56d5613',
-  'full_hash' => 'v8.2.0-176-g6e56d5613',
+  'hash_version' => 'g6ca49a20c',
+  'full_hash' => 'v8.2.1-10-g6ca49a20c',
   'branch' => 'master',
 );