Merge branch 'master' into divVerent/crypto2

Conflicts:
	all

diff --cc all
index f22a8b72e501ce722e262b7e2038a0e038563c73,6b417991c38f32924039ec33376179165fb9a144..fb15fb02e97833392ec69c0c8ef49f706d42a4f3
--- 1/all
--- 2/all
+++ b/all
@@@ -550,18 -548,10 +550,11 @@@ case "$cmd" i
                                cleanqc=true
                                shift
                                ;;
-                       -n)
-                               cleand0=false
-                               cleandp=false
-                               cleanqcc=false
-                               cleanqc=false
-                               shift
-                               ;;
                        *)
 +                              cleand0=false
                                cleandp=false
                                cleanqcc=false
-                               cleanqc=true # version info
+                               cleanqc=false
                                ;;
                esac
                if [ $# -gt 0 ] && [ x"$1" = x"" ]; then