Merge pull request #1424 from WindowsAzure/storage-hotfix

Collapsing hotifx release branch into master
Merge pull request #1425 from WindowsAzure/master

Merging 0.6.13.1 release into dev