merged sublime3 branch
merged sublime3