Merge "Merge branch '1.3-rel'"
authorGreg Zaverucha <gregz@microsoft.com>
Mon, 17 Apr 2017 19:57:47 +0000 (19:57 +0000)
committerGerrit Code Review <gerrit@172.30.200.205>
Mon, 17 Apr 2017 19:57:47 +0000 (19:57 +0000)

Trivial merge