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.1',
-  'full_app_version' => 'v8.2.1 - build 19068-g6ca49a20c',
-  'build_version' => '19068',
+  'app_version' => 'v8.2.2-pre',
+  'full_app_version' => 'v8.2.2-pre - build 19319-ga36afbcb2',
+  'build_version' => '19319',
   'prerelease_version' => '',
-  'hash_version' => 'g6ca49a20c',
-  'full_hash' => 'v8.2.1-10-g6ca49a20c',
+  'hash_version' => 'ga36afbcb2',
+  'full_hash' => 'v8.2.2-pre-249-ga36afbcb2',
   'branch' => 'master',
 );