Merge remote-tracking branch 'origin/staging' into staging
authorWei Liu <wei.liu2@citrix.com>
Thu, 2 Nov 2017 17:07:58 +0000 (17:07 +0000)
committerWei Liu <wei.liu2@citrix.com>
Thu, 2 Nov 2017 17:07:58 +0000 (17:07 +0000)

Trivial merge