Prevent infinite loop when container is resized
Merge branch 'fix_bootstrap_resizing_infinite_loop'
Fixed indentation