Merge trunk->0.10