Merge remote-tracking branch 'origin/develop'

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

# Conflicts:
#	config/version.php

config/version.php

 <?php
 return array (
-  'app_version' => 'v5.1.5',
-  'full_app_version' => 'v5.1.5 - build 6082-g9eea46ade',
-  'build_version' => '6082',
+  'app_version' => 'v5.1.6',
+  'full_app_version' => 'v5.1.6 - build 6109-gace7abc1a',
+  'build_version' => '6109',
   'prerelease_version' => '',
-  'hash_version' => 'g9eea46ade',
-  'full_hash' => 'v5.1.5-44-g9eea46ade',
-  'branch' => 'master',
+  'hash_version' => 'gace7abc1a',
+  'full_hash' => 'v5.1.6-71-gace7abc1a',
+  'branch' => 'develop',
 );
\ No newline at end of file