Merge pull request #1 from aws/master

Update 2014 02 27