Merge commit '294ec7f480908268055b273da96674382b84e198' from swiper

diff --cc packages/swiper/counsel.el
Simple merge

diff --cc packages/swiper/ivy.el
index c4a491399888e528da59c1f56c1d2a06710b23d4,88825aa1518b375409952cbcabd145f8405d114d..131ad0d5fd3771b6880c4eca52adbbe5c4fcaac7
--- 1/packages/swiper/ivy.el
--- 2/ivy.el
+++ b/packages/swiper/ivy.el
@@@ -36,9 -36,9 +36,11 @@@
  ;; re-building it into a regex.
  ;; So "for example" is transformed into "\\(for\\).*\\(example\\)".
  
 +(require 'cl-lib)
 +
  ;;; Code:
+ (require 'cl-lib)
+ 
  ;;* Customization
  (defgroup ivy nil
    "Incremental vertical completion."