Fixed merge conflict
Fixed merge conflict
Merge branch 'release/1.7' of github.com:easydigitaldownloads/Easy-Digital-Downloads into release/1.7
Merge branch 'release/1.7' of github.com:easydigitaldownloads/Easy-Digital-Downloads into release/1.7