- Security and bug-fix update - Remove build fix (included upstream) - Fix-up CMakeLists patches Security: d9e01c35-2531-11e7-b291-b499baebfeaf