Merge branch 'master' into valuenum-fix
authorBrian Sullivan <briansul@microsoft.com>
Fri, 9 Mar 2018 21:41:15 +0000 (13:41 -0800)
committerBrian Sullivan <briansul@microsoft.com>
Fri, 9 Mar 2018 21:41:15 +0000 (13:41 -0800)

Trivial merge