Updating master to 3.0.11