Version bumps and small fixes to bootstrap