2.2.2 release
Merge remote-tracking branch 'origin/master'