Initial 3.0.11 commit