Merge master into future

[ghost]

This is an automatically generated pull request from master into future.

@dotnet/roslyn-infrastructure:

git remote add vslsnap-roslyn "https://github.com/vslsnap/roslyn.git"
git fetch vslsnap-roslyn
git fetch upstream
git checkout merge-master-into-future20160512-150016
git reset --hard upstream/future
git merge upstream/master
# Fix merge conflicts
git commit
git push vslsnap-roslyn merge-master-into-future20160512-150016 --force

Once the merge can be made and all the tests pass, you are free to merge the pull request.

[ghost]

@dotnet-bot test vsi please

[msJohnHamby]

test vsi please