Carousel.js: manual merge of some fixes from branch carousel_3.0