Merge branch 'master' into no-wishlist-autocomplete

deploy.sh

@@ -26,8 +26,8 @@ fi
 currentbranch="$(git branch --format '%(refname:short)')"
 
 # If we are not on target branch, switch and run again
-if test "$currentbranch" -ne "$branch"; then
+if test "$currentbranch" '!=' "$branch"; then
-	exec /bin/sh -eu "git checkout $branch && exec $0"
+	exec /bin/sh -eu -c "git checkout $branch && exec $0"
 fi
 
 echo "Deploying branch $branch"