Fix for #1242
Initial commit to fix #1207
Fix duplicate key in unit test. Closes #1302
Fix for #1320
Merge branch 'release/1.7' of github.com:ghost1227/Easy-Digital-Downloads into ghost1227-release/1.7
Merge branch 'ghost1227-release/1.7' into release/1.7
Merge branch 'release/1.7' of github.com:easydigitaldownloads/Easy-Digital-Downloads into release/1.7