Bootstrap 3 RC1

Resubmitted #626 for new branch