diff --git a/CHANGELOG.md b/CHANGELOG.md
index ad63f02c5..9c7085723 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 == Changelog ===
 
+= 5.1.4 =
+* Update Matomo core to version 5.1.2 (changes: https://matomo.org/changelog/matomo-5-1-2/)
+* Update some Matomo core dependencies.
+
 = 5.1.3 =
 * Update Matomo core to version 5.1.1 (changes: https://matomo.org/changelog/matomo-5-1-1/)
 * Moderate redesign to the feedback and get started admin pages.
diff --git a/matomo.php b/matomo.php
index 8735e11d2..f4f28b8f4 100644
--- a/matomo.php
+++ b/matomo.php
@@ -4,7 +4,7 @@
  * Description: Privacy friendly, GDPR compliant and self-hosted. Matomo is the #1 Google Analytics alternative that gives you control of your data. Free and secure.
  * Author: Matomo
  * Author URI: https://matomo.org
- * Version: 5.1.3
+ * Version: 5.1.4
  * Domain Path: /languages
  * WC requires at least: 2.4.0
  * WC tested up to: 9.3.3
diff --git a/readme.txt b/readme.txt
index 81219af40..f90a372e1 100644
--- a/readme.txt
+++ b/readme.txt
@@ -3,7 +3,7 @@ Contributors: matomoteam
 Tags: matomo,analytics,statistics,stats,ecommerce
 Requires at least: 4.8
 Tested up to: 6.6.2
-Stable tag: 5.1.3
+Stable tag: 5.1.4
 Requires PHP: 7.2.5
 License: GPLv3 or later
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
@@ -14,6 +14,8 @@ Privacy friendly, GDPR compliant and self-hosted, Matomo is the #1 Google Analyt
 
 _Already a Matomo On-Premise or Matomo Cloud user? You need to use the [Connect Matomo plugin](https://wordpress.org/plugins/wp-piwik/) instead of this plugin._
 
+**New in version 5.1.4: fixes for a couple security issues. It is recommended to update to this version.**
+
 [youtube https://www.youtube.com/watch?v=puxi_Ey0iLc]
 
 For all you WordPress website owners wanting an easier way to get customer insights to grow your business, you can now get the solution the professionals use, for free!
diff --git a/scripts/local-dev-entrypoint.sh b/scripts/local-dev-entrypoint.sh
index 13fdebda1..6668b5546 100755
--- a/scripts/local-dev-entrypoint.sh
+++ b/scripts/local-dev-entrypoint.sh
@@ -152,6 +152,24 @@ define( 'WPMS_SMTP_PASS', '' );
 define( 'MATOMO_ANALYTICS_FILE', __DIR__ . '/wp-content/plugins/matomo/matomo.php' );
 define( 'MATOMO_LOCAL_ENVIRONMENT', 1 );
 
+if ( ! empty( \$_SERVER['HTTP_HOST'] )
+	&& preg_match( '/\.ngrok-free\.app$/', \$_SERVER['HTTP_HOST'] )
+) {
+	\$folder = basename( __DIR__ );
+	define('WP_HOME', 'https://' . \$_SERVER['HTTP_HOST'] . '/' . \$folder );
+	define('WP_SITEURL', 'https://' . \$_SERVER['HTTP_HOST'] . '/' . \$folder );
+} else {
+	\$folder = basename( __DIR__ );
+	define('WP_HOME', 'http://localhost/' . \$folder);
+	define('WP_SITEURL', 'http://localhost/' . \$folder);
+}
+
+if ( isset( \$_SERVER['HTTP_X_FORWARDED_PROTO'] )
+  && strpos( \$_SERVER['HTTP_X_FORWARDED_PROTO'], 'https' ) !== false
+) {
+	\$_SERVER['HTTPS'] = 'on';
+}
+
 \$table_prefix = 'wp_';
 
 /* That's all, stop editing! Happy publishing. */