Merge branch 'master' into 4.0-pre-not-stable

bin/build-helper

@@ -205,17 +205,21 @@ eof
         fi
 
         # Ensure we are on the master branch
+        masterbranch=yes
         if [ "$(git rev-parse --abbrev-ref HEAD)" != "master" ]; then
             echo "Releases are happening from the master branch, aborting"
 
             echo "Enter the magic word to release anyway"
             read magicword
 
-            if [ "$magicword" != "iknowwhatido" ]; then
+            if [ "$magicword" = "iknowwhatido" ]; then
+                masterbranch=no
+            else
                 exit 1
             fi
         fi
 
+        if [ "$masterbranch" = yes ]; then
             # Ensure version branch exists
             if ! git rev-parse --verify refs/heads/$target_branch 2>/dev/null; then
                 git branch "$target_branch"
@@ -224,6 +228,7 @@ eof
             # Merge master branch into version branch
             git checkout "$target_branch"
             git merge master
+        fi
 
         # Verify that after the merge everything works
         "$0" check-date