R2.2

Merge r2.2 into master as it still seems that the 2.2 versions of the plugins are in more of a demand.