Merged stable-1.2 and 1.1
Merged stable-1.2 and 1.1