BZ-99999 Fix build errors.
Merge branch 'master' of https://github.com/NoesisEnergy/bootstrap.git