Merge branch 'master' into next

powerlevel9k.zsh-theme

@@ -1354,7 +1354,7 @@ prompt_powerlevel9k_setup() {
   # returns. We need prompt_subst so we can safely run commands in the prompt
   # without them being double expanded and we need prompt_percent to expand the
   # common percent escape sequences.
-  prompt_opts=(subst percent)
+  prompt_opts=(subst percent cr)
 
   # Borrowed from promptinit, sets the prompt options in case the theme was
   # not initialized via promptinit.