diff --git a/.travis.yml b/.travis.yml
index 507659479..d9d64cdf9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -57,7 +57,7 @@ before_install:
         fi;
     fi
 before_script:
-    - if [ $TRAVIS_PHP_VERSION != 'hhvm' ]; then phpenv config-rm xdebug.ini; fi
+  - phpenv config-rm xdebug.ini
 script:
   - if [ $TRAVIS_BRANCH == 'develop' ] || [ $TRAVIS_PULL_REQUEST != 'false' ]; then
         vendor/bin/codecept run;
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a7932b3b7..82ee815c4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# v1.6.24
+## 04/27/2020
+
+1. [](#improved)
+    * Added support for `X-Forwarded-Host` [#2891](https://github.com/getgrav/grav/pull/2891)
+    * Disable XDebug in Travis builds
+
 # v1.6.23
 ## 03/19/2020
 
diff --git a/system/defines.php b/system/defines.php
index cbe19f52f..db903544c 100644
--- a/system/defines.php
+++ b/system/defines.php
@@ -8,7 +8,7 @@
 
 // Some standard defines
 define('GRAV', true);
-define('GRAV_VERSION', '1.6.23');
+define('GRAV_VERSION', '1.6.24');
 define('GRAV_TESTING', false);
 define('DS', '/');
 
diff --git a/system/src/Grav/Common/Uri.php b/system/src/Grav/Common/Uri.php
index 10e85a5cc..eee3807f9 100644
--- a/system/src/Grav/Common/Uri.php
+++ b/system/src/Grav/Common/Uri.php
@@ -1169,7 +1169,9 @@ class Uri
 
         // Build host.
         $hostname = 'localhost';
-        if (isset($env['HTTP_HOST'])) {
+        if (isset($env['HTTP_X_FORWARDED_HOST'])) {
+            $hostname = $env['HTTP_X_FORWARDED_HOST'];
+        } else if (isset($env['HTTP_HOST'])) {
             $hostname = $env['HTTP_HOST'];
         } elseif (isset($env['SERVER_NAME'])) {
             $hostname = $env['SERVER_NAME'];