allow more flexible aws copy
Merge remote-tracking branch 'origin/master'