Merge with master

2 files changed, 3 insertions, 3 deletions

diff --git a/core/AssetManager/UIAssetMerger/StylesheetUIAssetMerger.php b/core/AssetManager/UIAssetMerger/StylesheetUIAssetMerger.php
index 05053be16c..ae47646396 100644
--- a/core/AssetManager/UIAssetMerger/StylesheetUIAssetMerger.php
+++ b/core/AssetManager/UIAssetMerger/StylesheetUIAssetMerger.php
@@ -9,10 +9,10 @@
 namespace Piwik\AssetManager\UIAssetMerger;
 
 use Exception;
+use lessc;
 use Piwik\AssetManager\UIAsset;
 use Piwik\AssetManager\UIAssetMerger;
 use Piwik\Piwik;
-use lessc;
 
 class StylesheetUIAssetMerger extends UIAssetMerger
 {
@@ -158,7 +158,7 @@ class StylesheetUIAssetMerger extends UIAssetMerger
         $rootDirectory = realpath($uiAsset->getBaseDirectory());
 
         if ($rootDirectory != PATH_SEPARATOR
-            && substr_compare($rootDirectory, PATH_SEPARATOR, -1)) {
+            && substr($rootDirectory, -strlen(PATH_SEPARATOR)) !== PATH_SEPARATOR) {
             $rootDirectory .= PATH_SEPARATOR;
         }
         $rootDirectoryLen = strlen($rootDirectory);
diff --git a/core/AssetManager/UIAssetMinifier.php b/core/AssetManager/UIAssetMinifier.php
index 34006f5a32..4388ecaaa9 100644
--- a/core/AssetManager/UIAssetMinifier.php
+++ b/core/AssetManager/UIAssetMinifier.php
@@ -10,8 +10,8 @@
 namespace Piwik\AssetManager;
 
 use Exception;
-use Piwik\Singleton;
 use JShrink\Minifier;
+use Piwik\Singleton;
 
 class UIAssetMinifier extends Singleton
 {