[Upg] bootstrap 3.0.2 to 3.0.3
Merge branch '1.1' into 1.2