Catch bootstrap3 up with the latest dev branch work