Merge branch 'v2.0' into v2.1

I had to remove the postproc.sh file added in v2.0
to post-process html files (in v2.1 this is done in go-doxygen)

Conflicts:
	user-doc/Makefile