Amazon: update API stuff.
Merge branch 'caine/amazon/intl'