Merge pull request #1230 in master
fix ZendService\Amazon links
Merge pull request #1232
Merge pull request #1232 in develop