Merge branch 'ns/fix-make-docs' into next

Conflicts:
	Changelog.draft.rst

docs/Makefile

@@ -5,8 +5,8 @@ SOURCES = $(wildcard *.rst)
 HTML_TARGETS = $(patsubst %.rst,%.html,$(SOURCES))
 
 RM = rm
-RST2HTML=`type rst2html 2>/dev/null && echo rst2html || echo rst2html.py`
-RST2MAN=`type rst2man 2>/dev/null && echo rst2man || echo rst2man.py`
+RST2HTML=`type rst2html 2>/dev/null 2>&1 && echo rst2html || echo rst2html.py`
+RST2MAN=`type rst2man 2>/dev/null 2>&1 && echo rst2man || echo rst2man.py`
 
 all: html