Merge 0.9 -> trunk (like this?)