* Merged from the experimental branch.
10 files changed