diff --git a/HISTORY.rst b/HISTORY.rst
index 46be4a40..683b1c13 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -9,6 +9,7 @@ PlatformIO 3.0
 
 * Improved detecting of ARM mbed media disk for uploading
 * Improved Project Generator for CLion IDE when source folder contains nested items
+* Fixed issue with ``PATH`` auto-configuring for upload tools
 
 -------
 
diff --git a/platformio/__init__.py b/platformio/__init__.py
index 9e4ad77e..71167fe7 100644
--- a/platformio/__init__.py
+++ b/platformio/__init__.py
@@ -14,7 +14,7 @@
 
 import sys
 
-VERSION = (3, 1, "1a1")
+VERSION = (3, 1, "1a2")
 __version__ = ".".join([str(s) for s in VERSION])
 
 __title__ = "platformio"
diff --git a/platformio/builder/tools/pioplatform.py b/platformio/builder/tools/pioplatform.py
index 42ad2ef4..2c4d9184 100644
--- a/platformio/builder/tools/pioplatform.py
+++ b/platformio/builder/tools/pioplatform.py
@@ -31,7 +31,7 @@ def initPioPlatform(name):
 def PioPlatform(env):
     variables = {}
     for key in ("board", "pioframework"):
-        if key not in env:
+        if key.upper() not in env:
             continue
         variables[key] = env[key.upper()]
     p = initPioPlatform(env['PLATFORM_MANIFEST'])