Merged trunk with my branch.