Merge branch 'master' into fix-1633

README.md

@@ -137,8 +137,6 @@ Status
 ------
 
 Dune is now fairly stable and is used by the majority of packages on
-opam. The package is still in beta version as we are waiting for the
-renaming from Jbuilder to dune before releasing version 1.0.0. Note
-that dune will have backward compatibility with Jbuilder, in particular
-existing Jbuilder projects will continue to be buildable with
-dune.
+opam. Note that dune retains backward compatibility with Jbuilder, and
+in particular existing Jbuilder projects will continue to be buildable
+with dune.

test/blackbox-tests/dune.inc

@@ -1262,7 +1262,6 @@
   (alias lib-available)
   (alias lib-errors)
   (alias link-deps)
-  (alias lint)
   (alias loop)
   (alias macro-expand-error)
   (alias menhir)
@@ -1404,7 +1403,6 @@
   (alias lib-available)
   (alias lib-errors)
   (alias link-deps)
-  (alias lint)
   (alias loop)
   (alias macro-expand-error)
   (alias merlin-tests)
@@ -1453,6 +1451,6 @@
   (alias wrapped-false-main-module-name)
   (alias wrapped-transition)))
 
-(alias (name runtest-disabled) (deps (alias envs-and-contexts)))
+(alias (name runtest-disabled) (deps (alias envs-and-contexts) (alias lint)))
 
 (alias (name runtest-js) (deps (alias js_of_ocaml)))