Merge pull request #1345 from WindowsAzure/master

Merging release 0.6.13 back into dev