Merge branch 'master' into saverio

Conflicts:
	src/libmeshlink.c

diff --cc src/libmeshlink.c
Simple merge

diff --cc src/libmeshlink.h
Simple merge

diff --cc src/route.c
Simple merge