diff --git a/ChangeLog b/ChangeLog
index c3b07431c..32916e3a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
-2.5.2 (?) ?
+2.5.2 () -
+
+- Removed deprecated 'alias._query' setting.
 
 2.5.1 (2016-02-24) 8b4ae3b54b44dfbd00b96cdd6dceb8dfe7cc1ea0
 
@@ -110,8 +112,14 @@
 - The 'run_all' script was not correctly using exit code 0 when all tests pass
           (thanks to Gordon Ball).
 
+<<<<<<< HEAD
 ------ current release ---------------------------
 
+||||||| parent of 19b2151f... Cleanup: Removed deprecated 'alias._query' setting
+=======
+------ old releases ------------------------------
+
+>>>>>>> 19b2151f... Cleanup: Removed deprecated 'alias._query' setting
 2.5.0 (2015-10-21) dd5968a61b1fab258b38879cfdbb7d67f1bcd550
 
 - TW-20   Task edit loses annotation precision, causing journal updating code
@@ -325,8 +333,6 @@
   added.
 - When GC is turned off, disable the query shortcuts, which no longer apply.
 
------- old releases ------------------------------
-
 2.4.4 (2015-05-10) df49aaba126484b668c41d3ff9301f8d8ec49987
 
 - TW-69   wait dates relative to due date (thanks to John Florian).
diff --git a/DEVELOPER b/DEVELOPER
index 6af9d9631..8eb0b44cc 100644
--- a/DEVELOPER
+++ b/DEVELOPER
@@ -10,7 +10,7 @@ How to Build Taskwarrior
   Obtain and build code:
     $ git clone https://git.tasktools.org/scm/tm/task.git task.git
     $ cd task.git
-    $ git checkout 2.5.0                 # Latest dev branch
+    $ git checkout 2.6.0                 # Latest dev branch
     $ cmake -DCMAKE_BUILD_TYPE=debug .   # debug or release. Default: neither.
     $ make VERBOSE=1                     # Shows details
 
@@ -158,11 +158,11 @@ Work in Progress
 Current Codebase Condition
 
   'master' branch:
-    - 2.4.4 Current release, locked.
+    - 2.5.1 Current release, locked.
 
-  '2.5.0' branch:
+  '2.6.0' branch:
     - Current development branch no plans yet.
 
 ---
 
-2015-09-07 Updated for 2.5.0
+2016-02-24 Updated for 2.6.0
diff --git a/NEWS b/NEWS
index 288e649e2..01a955d27 100644
--- a/NEWS
+++ b/NEWS
@@ -17,6 +17,7 @@ Newly Deprecated Features in Taskwarrior 2.5.2
 
 Removed Features in 2.5.2
 
+  - Removed 'alias._query' default configuration.
 
 Known Issues
 
diff --git a/src/legacy.cpp b/src/legacy.cpp
index 6139505fd..be4039cf0 100644
--- a/src/legacy.cpp
+++ b/src/legacy.cpp
@@ -96,22 +96,21 @@ std::string legacyCheckForDeprecatedVariables ()
   for (auto& it : context.config)
   {
     // 2014-07-04: report.*.limit removed.
+    // 2016-02-24: alias._query removed.
 
+    // Deprecated in 2.5.0.
     // report.*.annotations
     if (it.first.length () > 19 &&
         it.first.substr (0, 7) == "report." &&
         it.first.substr (it.first.length () - 12) == ".annotations")
       deprecated.push_back (it.first);
 
+    // Deprecated in 2.5.0.
     if (it.first == "next"              ||
         it.first == "annotations"       ||
         it.first == "export.ical.class")
       deprecated.push_back (it.first);
 
-    // Deprecated іn 2.4.0.
-    if (it.first == "alias._query")
-      deprecated.push_back (it.first);
-
     // Deprecated in 2.5.0.
     if (it.first == "urgency.inherit.coefficient")
         deprecated.push_back (it.first);
@@ -140,6 +139,7 @@ std::string legacyCheckForDeprecatedColumns ()
   {
     if (it.first.find ("report") == 0)
     {
+      // Deprecated in 2.0.0
       std::string value = context.config.get (it.first);
       if (value.find ("entry_time") != std::string::npos ||
           value.find ("start_time") != std::string::npos ||