Merge 9af5e9a8f80a into 0.2 branch.