Merge 0.11 release branch