Tagging 0.9.2
Merge 0.9->0.10
Merge 0.10->trunk