Almost ready for 1.6a2.
32 files changed