copy across change from base class
Merge branch 'bootstrap-improvements'