merged bootstrap fix to 3.x