New upstream release

And fixes needed to build it

Signed-off-by: Paul Belanger <paul.belanger@polybeacon.com>