Merge pull request #1121 from WindowsAzure/dev

Merged dev into release
Merge pull request #1122 from WindowsAzure/dev

Merging richard changes
Merge remote-tracking branch 'upstream/release-0.8.0' into dev