Merged master into swift-3.1-branch

I just merged master into swift-3.1-branch for following projects.

Thanks,
Mishal Shah