Merge conflicts between 3.0.12 and 3.0.14
branches: 1.2.2;merge conflicts between 1.1.1t and 3.0.8
branches: 1.1.1;Initial revision