Merge pull request #1420 from timlinux/master

Merge 2.2.0 work into master