merged 1.1 branch into head