Train 10

Merge 0.10.1 hot patch back into master.