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