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

bin/build-helper

@@ -207,8 +207,14 @@ eof
         # Ensure we are on the master branch
         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
                 exit 1
             fi
+        fi
 
         # Ensure version branch exists
         if ! git rev-parse --verify refs/heads/$target_branch 2>/dev/null; then