Merge 1.0.2pre