Merge remote-tracking branch 'origin/development'.  This version has
proven stable in 2 reasonable environments for 1 week.
Added a todo