Merge this repository into aws-sdk

See related pull request aws/aws-sdk-js#379