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.6',
-  'full_app_version' => 'v5.1.6 - build 6109-gace7abc1a',
-  'build_version' => '6109',
+  'app_version' => 'v5.1.7',
+  'full_app_version' => 'v5.1.7 - build 6136-gbc0c88781',
+  'build_version' => '6136',
   'prerelease_version' => '',
-  'hash_version' => 'gace7abc1a',
-  'full_hash' => 'v5.1.6-71-gace7abc1a',
+  'hash_version' => 'gbc0c88781',
+  'full_hash' => 'v5.1.7-25-gbc0c88781',
   'branch' => 'master',
 );
\ No newline at end of file