Merge branch 'master' into release/2.2
Merge branch 'release/2.2' of github.com:easydigitaldownloads/Easy-Digital-Downloads into release/2.2