Merge pull request #315 from markcowl/bug311

Bug 311
Merge branch 'master' of https://github.com/WindowsAzure/azure-sdk-for-net into dev
Merge pull request #329 from veena-udayabhanu/dev

Dev