Merge from 3.6
authorSteve Dower <steve.dower@microsoft.com>
Sun, 20 Nov 2016 05:14:37 +0000 (21:14 -0800)
committerSteve Dower <steve.dower@microsoft.com>
Sun, 20 Nov 2016 05:14:37 +0000 (21:14 -0800)

Trivial merge