Merge remote-tracking branch 'origin/develop'

# Conflicts:
#	config/version.php

Author: snipe

config/version.php

@@ -1,10 +1,10 @@
 <?php
 return array (
-  'app_version' => 'v5.0.10',
-  'full_app_version' => 'v5.0.10 - build 5680-gf9b1fdc36',
-  'build_version' => '5680',
+  'app_version' => 'v5.0.11',
+  'full_app_version' => 'v5.0.11 - build 5695-gfd4ee6027',
+  'build_version' => '5695',
   'prerelease_version' => '',
-  'hash_version' => 'gf9b1fdc36',
-  'full_hash' => 'v5.0.10-21-gf9b1fdc36',
+  'hash_version' => 'gfd4ee6027',
+  'full_hash' => 'v5.0.11-13-gfd4ee6027',
   'branch' => 'master',
 );