Fast forward bootstrap-3 to match master