Merge branch 'master' into no-wishlist-autocomplete

deploy.sh

@@ -27,7 +27,7 @@ currentbranch="$(git rev-parse --abbrev-ref HEAD)"
 
 # If we are not on target branch, switch and run again
 if test "$currentbranch" '!=' "$branch"; then
-	exec /bin/sh -eu -c "git checkout $branch && exec $0 $branch"
+	exec /bin/sh -eu -c "git checkout $branch && git pull && exec $0 $branch"
 fi
 
 echo "Deploying branch $branch"