remove unused malloc.h include (fix FreeBSD build)
Merge branch 'stable'