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' => 'v7.1.14',
-  'full_app_version' => 'v7.1.14 - build 15942-g3bf33aa68',
-  'build_version' => '15942',
+  'app_version' => 'v7.1.15',
+  'full_app_version' => 'v7.1.15 - build 16052-g25bfd3e84',
+  'build_version' => '16052',
   'prerelease_version' => '',
-  'hash_version' => 'g3bf33aa68',
-  'full_hash' => 'v7.1.14-420-g3bf33aa68',
+  'hash_version' => 'g25bfd3e84',
+  'full_hash' => 'v7.1.15-105-g25bfd3e84',
   'branch' => 'master',
 );