Merge changes in 0.90.
8 files changed