Massive roll-up of changes.  See CHANGES.txt.
153 files changed