1.2.2 release
Merged master