Merge branch '2.6.0' into getFromContext

ChangeLog

@@ -8,32 +8,42 @@
 - TW #1804 Importing malformed annotation (without entry timestamp) causes
            segmentation fault.
            Thanks to David Badura.
+- TW #1824 Fixed countdown formatting
+           Thanks to Sebastian Uharek
 - TW #1896 Parser cannot handle empty parentheses
            Thanks to Tomas Babej.
 - TW #1908 Cannot create task with explicit description 'start ....'
            Thanks to Matt Chun-Lum.
 - TW #1911 Support holidays longer then 1 day
            Thanks to Daniel Mowitz.
+- TW #1913 Project names with dashes and attribute names fail to parse
+           Thanks to Yanick Champoux.
 - TW #1938 Missing annotation on import if entry is duplicated
            Thanks to Florian.
 - TW #1955 Adding tasks in context.
            Thanks to Jean-Francois Joly, Matt Smith.
+- TW #1960 Fixed bug with double escaped single quotes.
+           Thanks to Sebastian Uharek
 - TW #2004 "shell" should not be expand to "exec tasksh"
            Thanks to Arvedui
 - TW #2007 Compute number of current tasks correctly
            Thanks to Janik Rabe
 - TW #2017 Support 64-bit datetime values
            Thanks to Evgeniy Vasilev
-- TW #2257 UDA string fields can't start with certain keywords
-           Thanks to Michael Russell.
 - TW #2060 Review timestamp is displayed as unix time, not formatted
            Thanks to JavaZauber
 - TW #2093 wrong order under projects command
            Thanks to Beka, Max Rossmannek.
 - TW #2101 Numeric UDA values above 2,147,483,647 overflow without warning
            Thanks to Adam Monsen.
+- TW #2136 Configuration options can be overwritten for current context
+           Thanks to Sebastian Uharek
+- TW #2208 Feature: added coloring of dates with scheduled tasks to calendar
+           Thanks to Sebastian Uharek
 - TW #2247 Configuration override rc.verbose:off not respected
            Thanks to Vignesh Prabhu.
+- TW #2257 UDA string fields can't start with certain keywords
+           Thanks to Michael Russell.
 - TW #2290 Support moving the config file to XDG_CONFIG_HOME
            Thanks to Julien Rabinow.
 - TW #2292 CmdEdit: Interruption should remove lock file
@@ -77,13 +87,20 @@
 - TW #2536 Feature: inclusive range-end attribute modifier 'by' so 'end of'
            named dates can be filtered inclusively
            Thanks to Scott Mcdermott
-- TW #1824 Fixed countdown formatting
-           Thanks to Sebastian Uharek
-- #2208    Feature: added coloring of dates with scheduled tasks to calendar
-           Thanks to Sebastian Uharek
--          Feature: Configuration options can be overwritten for current
-           context
-           Thanks to Sebastian Uharek
+- TW #2550 Write context skipped if description contains an identifier
+           Thanks to Sebastian Fricke.
+- TW #2554 Remove the waiting state, and consider any task with wait>now to be
+           waiting
+           Thanks to Dustin J. Mitchell
+- TW #2560  Add report.<name>.context configuration variable
+           Thanks to Jake C.
+- TW #2569 The `json.depends.array` configuration option is now ignored.
+           Dependencies are always represented as an array in JSON output.
+           Thanks to Dustin J. Mitchell
+- TW #2580 Importing malformed JSON task crashes TW
+           Thanks to bharatvaj.
+- TW #2581 Config entry with a trailing comment cannot be modified
+
 
 ------ current release ---------------------------