Merge 0.8 -> trunk