Merge 1.0.11 to master