BZ-9999 fix mis-merge
Merge branch 'master' of https://github.com/NoesisEnergy/bootstrap