From: Matthew Barr <matthew.barr@intel.com>
Date: Fri, 16 Jun 2017 00:10:14 +0000 (+1000)
Subject: Merge branch develop into master
X-Git-Tag: v4.5.1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5f6096df99f41f59d1a1bee2bb142943f2ed6514;p=thirdparty%2Fvectorscan.git

Merge branch develop into master
---

5f6096df99f41f59d1a1bee2bb142943f2ed6514