Merge branch 'master' into dev-lib

Merged the dev-admin changes through mainline. Conflicts solved manually:

	filter/filter.h
	filter/tries.c
	lib/Makefile

diff --cc lib/Makefile
index 1f4193c1970b9bbe45880bdd52b3cf15e7159dcc,0c5d0ac730b192a92675f47dc200d8dcc5dcd3d5..49b6872f47a2e9c48eff5386d9ac2d41d28202b1
--- 1/lib/Makefile
--- 2/lib/Makefile
+++ b/lib/Makefile
@@@ -96,7 -98,7 +97,7 @@@ $(o)/lib/trie-test: $(o)/lib/trie-test.
  
  TESTS+=$(addprefix $(o)/lib/,regex.test unicode.test hash-test.test mempool.test stkstring.test \
      slists.test kmp-test.test bbuf.test getopt.test fastbuf.test ff-unicode.test eltpool.test \
-     fb-socket.test string.test sha1.test)
 -    fb-socket.test trie-test.test)
++    fb-socket.test trie-test.test string.test sha1.test)
  
  $(o)/lib/regex.test: $(o)/lib/regex-t
  $(o)/lib/unicode.test: $(o)/lib/unicode-t
@@@ -112,8 -114,7 +113,9 @@@ $(o)/lib/fastbuf.test: $(o)/lib/fb-file
  $(o)/lib/ff-unicode.test: $(o)/lib/ff-unicode-t
  $(o)/lib/eltpool.test: $(o)/lib/eltpool-t
  $(o)/lib/fb-socket.test: $(o)/lib/fb-socket-t
 +$(o)/lib/string.test: $(o)/lib/str-hex-t $(o)/lib/str-esc-t
 +$(o)/lib/sha1.test: $(o)/lib/sha1-t $(o)/lib/sha1-hmac-t
+ $(o)/lib/trie-test.test: $(o)/lib/trie-test
  
  ifdef CONFIG_UCW_THREADS
  TESTS+=$(addprefix $(o)/lib/,asio.test)