Merge branch 'master' into iot-1785
authorKevin Kane <kkane@microsoft.com>
Tue, 14 Feb 2017 17:37:49 +0000 (09:37 -0800)
committerKevin Kane <kkane@microsoft.com>
Tue, 14 Feb 2017 17:37:54 +0000 (09:37 -0800)
Change-Id: Ibbf0c86bc2c54e1ee283761b2131a301485bffff
Signed-off-by: Kevin Kane <kkane@microsoft.com>

Trivial merge