Merge branch '2018.12-rc' into task/move-config-to-php-array

diff --cc mod/credits.php
index cfcc30b3e2e3beb7f7879b70803109ca665e9456,f397bdca70f5f00898ae80d8cf3bf7b86f84f3e3..56b7cd6618cd90353789c2c9f5b87c3f44a8a4b7
--- 1/mod/credits.php
--- 2/mod/credits.php
+++ b/mod/credits.php
@@@ -12,8 -12,8 +12,8 @@@ use Friendica\Core\Renderer
  function credits_content()
  {
        /* fill the page with credits */
 -      $credits_string = file_get_contents('util/credits.txt');
 +      $credits_string = file_get_contents('CREDITS.txt');
-       $names = explode("\n", htmlspecialchars($credits_string));
+       $names = explode("\n", $credits_string);
        $tpl = Renderer::getMarkupTemplate('credits.tpl');
        return Renderer::replaceMacros($tpl, [
                '$title'  => L10n::t('Credits'),

diff --cc src/Core/Installer.php
Simple merge