Update to upstream version 2.2