Merge pull request #1203 in master
Merge pull request #1204 in master
Fixes headlines in ZendService\Amazon
Merge pull request #1205
Merge pull request #1205 in develop