Update to 2.2.16 + G+