Merge branch 'master' into iot-1785
authorKevin Kane <kkane@microsoft.com>
Tue, 14 Feb 2017 21:17:35 +0000 (13:17 -0800)
committerKevin Kane <kkane@microsoft.com>
Tue, 14 Feb 2017 21:17:47 +0000 (13:17 -0800)
Change-Id: If6d73dadd95c118e3e9bac61820c6ce0d5e550f3
Signed-off-by: Kevin Kane <kkane@microsoft.com>

Trivial merge