Merge Azure:master -> sethusrinivasan:master

Sync up with Azure:master