Updated to version 2.2.0
Merge pull request #10369 from Kexoth/master

Updated to version 2.2.0