diff --git a/.gitignore b/.gitignore
index d9d9d4924c8..479bc39764b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@
 .settings/org.eclipse.php.core.prefs
 .buildpath
 /application/config/config.php
+*un~
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 04a35999377..c5fac944c21 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log
 Only partial changelog, [commit history](https://framagit.org/Shnoulle/LimeSurvey/commits/2.06_SondagesPro) show all changelog.
 
+## unreleased
+
+### Fix
+- Expression manager convert_value does not obey strict setting (Olle Haerstedt) (2.6.1lts)
+- Date/Time filed does not record the answer (Olle Haerstedt) (2.6.1lts)
 
 ## [1.1.0] - 2016-11-10
 
diff --git a/application/controllers/admin/tokens.php b/application/controllers/admin/tokens.php
index cda37641069..201f42b6775 100644
--- a/application/controllers/admin/tokens.php
+++ b/application/controllers/admin/tokens.php
@@ -104,7 +104,7 @@ function bounceprocessing($iSurveyId)
                 $hostencryption=strtoupper($thissurvey['bounceaccountencryption']);
             }
 
-            @list($hostname, $port) = split(':', $hostname);
+            @list($hostname, $port) = explode(':', $hostname);
             if (empty($port))
             {
                 if ($accounttype == "IMAP")
diff --git a/application/helpers/expressions/em_core_helper.php b/application/helpers/expressions/em_core_helper.php
index 776c4117b64..0d591d4a08b 100644
--- a/application/helpers/expressions/em_core_helper.php
+++ b/application/helpers/expressions/em_core_helper.php
@@ -2707,7 +2707,7 @@ function exprmgr_convert_value($fValueToReplace, $iStrict, $sTranslateFromList,
 					$iNearestIndex = $i;
 				}
 			}
-			if ( $iStrict !== 1 ) {
+			if ( $iStrict != 1 ) {
 				return $aToValues[$iNearestIndex];
 			}
 		}
diff --git a/application/libraries/Date_Time_Converter.php b/application/libraries/Date_Time_Converter.php
index c40fb377127..c231ef60e90 100644
--- a/application/libraries/Date_Time_Converter.php
+++ b/application/libraries/Date_Time_Converter.php
@@ -97,9 +97,13 @@ private function _default_date_time_units() {
         $this->seconds 		= '00';
         $this->minutes		= '00';
         $this->hours		= '00';
-        $this->days			= '01';
-        $this->months		= '01';
-        $this->years		= '1970';
+
+        // Default must be set to "today", otherwise
+        // saving only hour will calculate wrong timestamp.
+        // See bug #11606.
+        $this->days         = date('d');
+        $this->months       = date('m');
+        $this->years        = date('Y');
         $this->ampm			= 'am';
     }
 
diff --git a/docs/release_notes.txt b/docs/release_notes.txt
index 3e669da9d0e..7cdb90cc63d 100644
--- a/docs/release_notes.txt
+++ b/docs/release_notes.txt
@@ -60,6 +60,14 @@ CHANGE LOG
 ------------------------------------------------------
 
 
+Changes from 2.06LTS (build 160801) to 2.6.1LTS (build 161024) Oct 24, 2016
+-Fixed issue #11455: MapQuest discontinued their free services (Markus Flür)
+-Fixed issue #11509: numerical input option integer only leads to positive integer input only (Denis Chenu)
+-Fixed issue #11613: Importing a participant having an empty token field is not possible (Carsten Schmitz)
+-Fixed issue #11772: Expression manager convert_value does not obey strict setting (Olle Haerstedt)
+-Fixed issue #11827: Email bounce processing fails on PHP 7 (Carsten Schmitz)
+-Fixed issue: ~ and _ in tokens hard to manually enter (Carsten Schmitz)
+
 Changes from 2.06LTS (build 160524) to 2.06LTS (build 160801) Aug 1, 2016
 -Fixed issue #10226: {ANSWERTABLE} includes <script> placed in question text (LouisGac)
 -Fixed issue #10952: Conditions do not show up in conditions designer after creation if using MSSQL and connecting from Linux using FreeTDS (Carsten Schmitz)
diff --git a/scripts/expressions/em_javascript.js b/scripts/expressions/em_javascript.js
index 0fc3cd8e9c4..afda0b0cbd7 100644
--- a/scripts/expressions/em_javascript.js
+++ b/scripts/expressions/em_javascript.js
@@ -254,7 +254,7 @@ function LEMconvert_value( fValueToReplace, iStrict, sTranslateFromList, sTransl
 				iNearestIndex = i;
 			}
 		}
-		if ( iStrict !== 1 ) {
+		if ( iStrict != 1 ) {
 			return aToValues[iNearestIndex];
 		}
 	}
diff --git a/scripts/map.js b/scripts/map.js
index 80a7f9adb65..834e7a6f3d7 100644
--- a/scripts/map.js
+++ b/scripts/map.js
@@ -51,12 +51,13 @@ function OSGeoInitialize(question,latLng){
 		};
 		var name = question.substr(0,question.length - 2);
 		// tiles layers def
+		// If not latLng is set the Map will center to Hamburg
 		var MapOption=LSmaps[name];
 		if(isNaN(MapOption.latitude) || MapOption.latitude==""){
-			MapOption.latitude=0;
+			MapOption.latitude=53.582665;
 		}
 		if(isNaN(MapOption.longitude) || MapOption.longitude==""){
-			MapOption.longitude=0;
+			MapOption.longitude=10.018924;
 		}
 		var mapOSM = L.tileLayer(tileServerURL.OSM+".png", {
 			maxZoom: 19,
@@ -91,7 +92,6 @@ function OSGeoInitialize(question,latLng){
 			"Cyclemap": mapCYC,
 			"Traffic Map" : mapTRA
 		};
-
 		var overlays = {
 		};
 		var map = L.map("map_"+name, {
@@ -144,6 +144,26 @@ function OSGeoInitialize(question,latLng){
 			}
 		)
 
+        // Zoom to 11 when switching to Aerial or Hybrid views - bug 10589
+        var layer2Name, layer3Name, layerIndex = 0;
+        for (var key in baseLayers) {
+            if (!baseLayers.hasOwnProperty(key)) {
+                continue;
+            }
+            if(layerIndex == 1) {
+                layer2Name = key;
+            }
+            else if(layerIndex == 2) {
+                layer3Name = key;
+            }
+            layerIndex++;
+        }
+        map.on('baselayerchange', function(e) {
+            if(e.name == layer2Name || e.name == layer3Name) {
+                map.setZoom(11);
+            }
+        });
+
 		marker.on('dragend', function(e){
 				var marker = e.target;
 				var position = marker.getLatLng();
@@ -194,7 +214,7 @@ function OSGeoInitialize(question,latLng){
 			appendTo: $("#searchbox_"+name).parent(),
 			source: function( request, response ) {
 				$.ajax({
-					url: "http://api.geonames.org/searchJSON",
+					url: "//api.geonames.org/searchJSON",
 					dataType: "jsonp",
 					data: {
 						username : LSmap.geonameUser,