Initial Bootstrap 3 branch merge