diff --git a/HISTORY.rst b/HISTORY.rst
index 11e6c6cc..bcd86676 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -4,6 +4,17 @@ Release Notes
 PlatformIO 2.0
 --------------
 
+2.8.5 (2016-02-??)
+~~~~~~~~~~~~~~~~~~
+
+* Fixed issue with incorrect handling of user's build flags where the base flags
+  were passed after user's flags to GCC compiler
+  (`issue #528 <https://github.com/platformio/platformio/issues/528>`_)
+* Fixed issue with Project Generator when optional build flags were passed using
+  system environment variables: `PLATFORMIO_BUILD_FLAGS <http://docs.platformio.org/en/latest/envvars.html#platformio-build-flags>`__
+  or `PLATFORMIO_BUILD_SRC_FLAGS <http://docs.platformio.org/en/latest/envvars.html#platformio-build-src-flags>`__
+
+
 2.8.4 (2016-02-17)
 ~~~~~~~~~~~~~~~~~~
 
diff --git a/platformio/__init__.py b/platformio/__init__.py
index 352fa2fe..c3eb4882 100644
--- a/platformio/__init__.py
+++ b/platformio/__init__.py
@@ -14,7 +14,7 @@
 
 import sys
 
-VERSION = (2, 8, 4)
+VERSION = (2, 8, "5.dev0")
 __version__ = ".".join([str(s) for s in VERSION])
 
 __title__ = "platformio"
diff --git a/platformio/builder/tools/piomisc.py b/platformio/builder/tools/piomisc.py
index f6c38555..dad73d16 100644
--- a/platformio/builder/tools/piomisc.py
+++ b/platformio/builder/tools/piomisc.py
@@ -228,6 +228,8 @@ def DumpIDEData(env):
     # https://github.com/platformio/platformio-atom-ide/issues/34
     _new_defines = []
     for item in env_.get("CPPDEFINES", []):
+        if isinstance(item, list):
+            item = "=".join(item)
         item = item.replace('\\"', '"')
         if " " in item:
             _new_defines.append(item.replace(" ", "\\\\ "))
diff --git a/platformio/telemetry.py b/platformio/telemetry.py
index cabda599..48ca79ab 100644
--- a/platformio/telemetry.py
+++ b/platformio/telemetry.py
@@ -95,7 +95,7 @@ class MeasurementProtocol(TelemetryBase):
 
         # gather dependent packages
         dpdata = []
-        dpdata.append("Click/%s" % click.__version__)
+        dpdata.append("PlatformIO/%s" % __version__)
         if app.get_session_var("caller_id"):
             dpdata.append("Caller/%s" % app.get_session_var("caller_id"))
         if getenv("PLATFORMIO_IDE"):