BZ-9741 handling extra small in a better fashion
Merge branch 'master' of https://github.com/NoesisEnergy/bootstrap.git
Merge branch 'master' of https://github.com/NoesisEnergy/bootstrap