Fixes
Merge branch 'EXODUS' of https://github.com/wSedlacek/vendor_vanir into HEAD