Merge remote-tracking branch 'origin/master' into drizzle

Conflicts:
	libraries/advisory_rules.txt

1 files changed, 1 insertions, 1 deletions

diff --git a/main.php b/main.php
index 5ac98a1b81..8101ab03d0 100644
--- a/main.php
+++ b/main.php
@@ -356,7 +356,7 @@ if (!function_exists('mcrypt_encrypt') && !$GLOBALS['cfg']['McryptDisableWarning
  * The data file is created while creating release by ./scripts/remove-incomplete-mo
  */
 if (file_exists('./libraries/language_stats.inc.php')) {
-    include('./libraries/language_stats.inc.php');
+    include './libraries/language_stats.inc.php';
     /*
      * This message is intentionally not translated, because we're
      * handling incomplete translations here and focus on english