tree 4052160e91d0de76764e60a94750d1b3ece1faa0
parent c12a743887550f97c7ea4db68cfd70266daa9069
parent cd34a82fc131ba242990cd70c67d1615168b0657
author Masood Malekghassemi <soltanmm@users.noreply.github.com> 1453420258 -0800
committer Masood Malekghassemi <soltanmm@users.noreply.github.com> 1453420258 -0800

Merge pull request #4802 from jtattermusch/integrate_0_12_changes

Integrate changes from release-0_12 branch back to master.