Update changes since 2.0dev6.txt