From: Xiang Wang <xiang.w.wang@intel.com>
Date: Fri, 19 Jan 2018 10:57:38 +0000 (-0500)
Subject: Merge branch master into develop
X-Git-Tag: v4.7.0^2~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0df8bf471c5583932c9357e68bd35f6d4cc10658;p=thirdparty%2Fvectorscan.git

Merge branch master into develop
---

0df8bf471c5583932c9357e68bd35f6d4cc10658